Revert "Teach the CMake build system to run lit's test suite. These c…

…an be run" This reverts r257221. This caused several build bot failures * It looks like some of the tests don't work correctly under Windows * It looks like the lit per test timeout tests fail So I'm reverting for now. Once the above failures are fixed running lit's tests can be enabled again. llvm-svn: 257268
llvm · Jan 9, 2016 · c754ace · c754ace
1 parent e1f72a6
commit c754ace
Showing 4 changed files with 2 additions and 51 deletions.
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
@@ -697,7 +697,6 @@ if( LLVM_INCLUDE_TESTS )
       EXCLUDE_FROM_ALL
       NO_INSTALL)
   endif()
-  add_subdirectory(utils/lit)
   add_subdirectory(test)
   add_subdirectory(unittests)
   if (MSVC)

diff --git a/llvm/utils/lit/CMakeLists.txt b/llvm/utils/lit/CMakeLists.txt
diff --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg
@@ -26,20 +26,12 @@ config.test_exec_root = config.test_source_root
 config.target_triple = '(unused)'
 
 src_root = os.path.join(config.test_source_root, '..')
-llvm_src_root = getattr(config, 'llvm_src_root', None)
-if llvm_src_root != None:
-  # ``src_root`` may be in LLVM's binary build directory which does not contain
-  # ``lit.py``, so use ``llvm_src_root`` instead.
-  lit_path = os.path.join(llvm_src_root, 'utils', 'lit')
-else:
-  lit_path = src_root
-
-config.environment['PYTHONPATH'] = lit_path # Required because some tests import the lit module
+config.environment['PYTHONPATH'] = src_root
 config.substitutions.append(('%{src_root}', src_root))
 config.substitutions.append(('%{inputs}', os.path.join(
             src_root, 'tests', 'Inputs')))
 config.substitutions.append(('%{lit}', "%%{python} %s" % (
-            os.path.join(lit_path, 'lit.py'),)))
+            os.path.join(src_root, 'lit.py'),)))
 config.substitutions.append(('%{python}', sys.executable))
 
 # Enable coverage.py reporting, assuming the coverage module has been installed
@@ -60,9 +52,3 @@ try:
 except ImportError:
     lit_config.warning('Could not import psutil. Some tests will be skipped and'
                        ' the --timeout command line argument will not work.')
-
-# Add llvm tools directory if this config is being loaded indirectly
-llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-if llvm_tools_dir != None:
-    path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
-    config.environment['PATH'] = path
diff --git a/llvm/utils/lit/tests/lit.site.cfg.in b/llvm/utils/lit/tests/lit.site.cfg.in