[test-suite] r302959 - cmake/lit: Flip default for config.traditional_output

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Fri May 12 15:15:52 PDT 2017


Author: matze
Date: Fri May 12 17:15:52 2017
New Revision: 302959

URL: http://llvm.org/viewvc/llvm-project?rev=302959&view=rev
Log:
cmake/lit: Flip default for config.traditional_output

There are more external suites added nowadays which all require
traditional_output = False, so switch the default to False and rather
set it explicitely to True for SingleSource/MultiSource and some
External/XXX tests.

Added:
    test-suite/trunk/External/Nurbs/lit.local.cfg
    test-suite/trunk/External/Povray/lit.local.cfg
    test-suite/trunk/MultiSource/lit.local.cfg
Removed:
    test-suite/trunk/External/SPEC/lit.local.cfg
Modified:
    test-suite/trunk/External/CUDA/lit.local.cfg
    test-suite/trunk/External/Nurbs/CMakeLists.txt
    test-suite/trunk/External/Povray/CMakeLists.txt
    test-suite/trunk/External/SPEC/CMakeLists.txt
    test-suite/trunk/External/skidmarks10/CMakeLists.txt
    test-suite/trunk/MultiSource/CMakeLists.txt
    test-suite/trunk/SingleSource/lit.local.cfg
    test-suite/trunk/lit.cfg

Modified: test-suite/trunk/External/CUDA/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/CUDA/lit.local.cfg?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/External/CUDA/lit.local.cfg (original)
+++ test-suite/trunk/External/CUDA/lit.local.cfg Fri May 12 17:15:52 2017
@@ -15,3 +15,5 @@ cuda_env_vars = [
 for var in cuda_env_vars:
   if var in os.environ:
     config.environment[var] = os.environ[var]
+
+config.traditional_output = True

Modified: test-suite/trunk/External/Nurbs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Nurbs/CMakeLists.txt?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/External/Nurbs/CMakeLists.txt (original)
+++ test-suite/trunk/External/Nurbs/CMakeLists.txt Fri May 12 17:15:52 2017
@@ -17,5 +17,7 @@ if(ARCH STREQUAL "x86")
 
     file(GLOB SOURCES ${TEST_SUITE_NURBS_ROOT}/*.cpp)
     llvm_test_executable(nurbs ${SOURCES})
+
+    file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
   endif()
 endif()

Added: test-suite/trunk/External/Nurbs/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Nurbs/lit.local.cfg?rev=302959&view=auto
==============================================================================
--- test-suite/trunk/External/Nurbs/lit.local.cfg (added)
+++ test-suite/trunk/External/Nurbs/lit.local.cfg Fri May 12 17:15:52 2017
@@ -0,0 +1 @@
+config.traditional_output = True

Modified: test-suite/trunk/External/Povray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Povray/CMakeLists.txt?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/External/Povray/CMakeLists.txt (original)
+++ test-suite/trunk/External/Povray/CMakeLists.txt Fri May 12 17:15:52 2017
@@ -32,4 +32,6 @@ if(TEST_SUITE_POVRAY_ROOT)
   )
 
   llvm_test_executable(povray ${Source})
+
+  file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 endif()

Added: test-suite/trunk/External/Povray/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Povray/lit.local.cfg?rev=302959&view=auto
==============================================================================
--- test-suite/trunk/External/Povray/lit.local.cfg (added)
+++ test-suite/trunk/External/Povray/lit.local.cfg Fri May 12 17:15:52 2017
@@ -0,0 +1 @@
+config.traditional_output = True

Modified: test-suite/trunk/External/SPEC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CMakeLists.txt?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CMakeLists.txt Fri May 12 17:15:52 2017
@@ -40,5 +40,3 @@ if(TEST_SUITE_SPEC2006_ROOT)
   add_subdirectory(CINT2006)
   add_subdirectory(CFP2006)
 endif()
-
-file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

Removed: test-suite/trunk/External/SPEC/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/lit.local.cfg?rev=302958&view=auto
==============================================================================
--- test-suite/trunk/External/SPEC/lit.local.cfg (original)
+++ test-suite/trunk/External/SPEC/lit.local.cfg (removed)
@@ -1 +0,0 @@
-config.traditional_output = False

Modified: test-suite/trunk/External/skidmarks10/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/skidmarks10/CMakeLists.txt?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/External/skidmarks10/CMakeLists.txt (original)
+++ test-suite/trunk/External/skidmarks10/CMakeLists.txt Fri May 12 17:15:52 2017
@@ -10,10 +10,6 @@ if(TEST_SUITE_SKIDMARKS10_ROOT)
 
   llvm_test_run(0 ${TEST_SUITE_SKIDMARKS10_ROOT}/golden
     WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-  llvm_test_verify(${FPCMP}
-    %o
-    ${CMAKE_CURRENT_SOURCE_DIR}/skidmarks.reference_output
-  )
   file(GLOB SOURCES ${TEST_SUITE_SKIDMARKS10_ROOT}/source/*.c)
   llvm_test_executable(skidmarks ${SOURCES})
 endif()

Modified: test-suite/trunk/MultiSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/CMakeLists.txt?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/CMakeLists.txt Fri May 12 17:15:52 2017
@@ -3,3 +3,5 @@ add_subdirectory(Benchmarks)
 if(NOT TEST_SUITE_BENCHMARKING_ONLY)
   add_subdirectory(UnitTests)
 endif()
+
+file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

Added: test-suite/trunk/MultiSource/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/lit.local.cfg?rev=302959&view=auto
==============================================================================
--- test-suite/trunk/MultiSource/lit.local.cfg (added)
+++ test-suite/trunk/MultiSource/lit.local.cfg Fri May 12 17:15:52 2017
@@ -0,0 +1 @@
+config.traditional_output = True

Modified: test-suite/trunk/SingleSource/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/lit.local.cfg?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/lit.local.cfg (original)
+++ test-suite/trunk/SingleSource/lit.local.cfg Fri May 12 17:15:52 2017
@@ -1 +1,2 @@
+config.traditional_output = True
 config.single_source = True

Modified: test-suite/trunk/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/lit.cfg?rev=302959&r1=302958&r2=302959&view=diff
==============================================================================
--- test-suite/trunk/lit.cfg (original)
+++ test-suite/trunk/lit.cfg Fri May 12 17:15:52 2017
@@ -10,7 +10,7 @@ config.test_format = test.TestSuiteTest(
 config.suffixes = ['.test']
 config.excludes = ['ABI-Testsuite']
 config.remote_flags = ""
-config.traditional_output = True
+config.traditional_output = False
 config.single_source = False
 if 'SSH_AUTH_SOCK' in os.environ:
     config.environment['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK']




More information about the llvm-commits mailing list