[PATCH] D69684: [debuginfo-tests] Don't look for Python 3 if we already have it

[Reid Kleckner via Phabricator via llvm-commits]

rnk updated this revision to Diff 227349.
rnk added a comment.

- Do a better job.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D69684/new/

https://reviews.llvm.org/D69684

Files:
  debuginfo-tests/CMakeLists.txt


Index: debuginfo-tests/CMakeLists.txt
===================================================================
--- debuginfo-tests/CMakeLists.txt
+++ debuginfo-tests/CMakeLists.txt
@@ -13,20 +13,26 @@
   not
   )
 
-# Wipe, uh, previous results
-unset(PYTHONINTERP_FOUND CACHE)
-unset(PYTHON_EXECUTABLE CACHE)
-unset(PYTHON_LIBRARY CACHE)
-unset(PYTHON_DLL CACHE)
-unset(PYTHON_INCLUDE_DIR CACHE)
-unset(PYTHON_VERSION_STRING CACHE)
-unset(PYTHON_VERSION_MAJOR CACHE)
-unset(PYTHON_VERSION_MINOR CACHE)
-unset(PYTHON_VERSION_PATCH CACHE)
-unset(PYTHONLIBS_VERSION_STRING CACHE)
+# If we don't already have Python 3, throw away any previous results and try to
+# find it again.
+set(DEBUGINFO_UNSET_PYTHON3 OFF)
+if (PYTHON_VERSION_MAJOR LESS 3)
+  unset(PYTHONINTERP_FOUND CACHE)
+  unset(PYTHON_EXECUTABLE CACHE)
+  unset(PYTHON_LIBRARY CACHE)
+  unset(PYTHON_DLL CACHE)
+  unset(PYTHON_INCLUDE_DIR CACHE)
+  unset(PYTHON_VERSION_STRING CACHE)
+  unset(PYTHON_VERSION_MAJOR CACHE)
+  unset(PYTHON_VERSION_MINOR CACHE)
+  unset(PYTHON_VERSION_PATCH CACHE)
+  unset(PYTHONLIBS_VERSION_STRING CACHE)
+
+  # Try to find python3. If it doesn't exist, dexter tests can't run.
+  find_package(PythonInterp "3")
+  set(DEBUGINFO_UNSET_PYTHON3 ON)
+endif()
 
-# Try to find python3. If it doesn't exist, dexter tests can't run.
-find_package(PythonInterp "3")
 if (NOT DEFINED PYTHON_EXECUTABLE)
   message(FATAL_ERROR "Cannot run debuginfo-tests without python")
 elseif(PYTHON_VERSION_MAJOR LESS 3)
@@ -43,17 +49,20 @@
     ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${DEBUGINFO_TEST_DEPS}
     )
-  set_target_properties(check-debuginfo PROPERTIES FOLDER "Debug info tests") 
+  set_target_properties(check-debuginfo PROPERTIES FOLDER "Debug info tests")
 endif()
 
-# Prevent the rest of llvm observing our secret python3-ness
-unset(PYTHONINTERP_FOUND CACHE)
-unset(PYTHON_EXECUTABLE CACHE)
-unset(PYTHON_LIBRARY CACHE)
-unset(PYTHON_DLL CACHE)
-unset(PYTHON_INCLUDE_DIR CACHE)
-unset(PYTHON_VERSION_STRING CACHE)
-unset(PYTHON_VERSION_MAJOR CACHE)
-unset(PYTHON_VERSION_MINOR CACHE)
-unset(PYTHON_VERSION_PATCH CACHE)
-unset(PYTHONLIBS_VERSION_STRING CACHE)
+# Prevent the rest of llvm observing our secret python3-ness, if that wasn't
+# what was originally found.
+if (DEBUGINFO_UNSET_PYTHON3)
+  unset(PYTHONINTERP_FOUND CACHE)
+  unset(PYTHON_EXECUTABLE CACHE)
+  unset(PYTHON_LIBRARY CACHE)
+  unset(PYTHON_DLL CACHE)
+  unset(PYTHON_INCLUDE_DIR CACHE)
+  unset(PYTHON_VERSION_STRING CACHE)
+  unset(PYTHON_VERSION_MAJOR CACHE)
+  unset(PYTHON_VERSION_MINOR CACHE)
+  unset(PYTHON_VERSION_PATCH CACHE)
+  unset(PYTHONLIBS_VERSION_STRING CACHE)
+endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69684.227349.patch
Type: text/x-patch
Size: 2649 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191031/04eaf8a2/attachment.bin>