[llvm] r257268 - Revert "Teach the CMake build system to run lit's test suite. These can be run"

[Dan Liew via llvm-commits]

Author: delcypher
Date: Sat Jan  9 15:42:57 2016
New Revision: 257268

URL: http://llvm.org/viewvc/llvm-project?rev=257268&view=rev
Log:
Revert "Teach the CMake build system to run lit's test suite. These can 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.

Removed:
    llvm/trunk/utils/lit/CMakeLists.txt
    llvm/trunk/utils/lit/tests/lit.site.cfg.in
Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/utils/lit/tests/lit.cfg

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=257268&r1=257267&r2=257268&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Sat Jan  9 15:42:57 2016
@@ -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)

Removed: llvm/trunk/utils/lit/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/CMakeLists.txt?rev=257267&view=auto
==============================================================================
--- llvm/trunk/utils/lit/CMakeLists.txt (original)
+++ llvm/trunk/utils/lit/CMakeLists.txt (removed)
@@ -1,26 +0,0 @@
-# The configured file is not placed in the correct location
-# until the tests are run as we need to copy it into
-# a copy of the tests folder
-configure_file("tests/lit.site.cfg.in" "lit.site.cfg" @ONLY)
-
-# Lit's test suite creates output files next to the sources which makes the
-# source tree dirty. This is undesirable because we do out of source builds.
-# To work around this the tests and the configuration file are copied into the
-# build directory just before running them. The tests are not copied over at
-# configure time (i.e. ``file(COPY ...)``) because this could lead to stale
-# tests being run.
-add_custom_target(prepare-check-lit
-  COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${CMAKE_CURRENT_BINARY_DIR}/tests"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg" "${CMAKE_CURRENT_BINARY_DIR}/tests"
-  COMMENT "Preparing lit tests"
-)
-
-# Add rules for lit's own test suite
-add_lit_testsuite(check-lit "Running lit's tests"
-  ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS "FileCheck" "not" "prepare-check-lit"
-)
-
-# For IDEs
-set_target_properties(check-lit PROPERTIES FOLDER "Tests")
-set_target_properties(prepare-check-lit PROPERTIES FOLDER "Tests")

Modified: llvm/trunk/utils/lit/tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/lit.cfg?rev=257268&r1=257267&r2=257268&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/lit.cfg (original)
+++ llvm/trunk/utils/lit/tests/lit.cfg Sat Jan  9 15:42:57 2016
@@ -26,20 +26,12 @@ config.test_exec_root = config.test_sour
 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

Removed: llvm/trunk/utils/lit/tests/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/lit.site.cfg.in?rev=257267&view=auto
==============================================================================
--- llvm/trunk/utils/lit/tests/lit.site.cfg.in (original)
+++ llvm/trunk/utils/lit/tests/lit.site.cfg.in (removed)
@@ -1,8 +0,0 @@
-## Autogenerated by LLVM/Clang configuration.
-# Do not edit!
-config.llvm_src_root = "@LLVM_SOURCE_DIR@"
-config.llvm_obj_root = "@LLVM_BINARY_DIR@"
-config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@"
-
-# Let the main config do the real work.
-lit_config.load_config(config, "@LLVM_BINARY_DIR@/utils/lit/tests/lit.cfg")