cmake/lit: Flip default for config.traditional_output

MatzeB · MatzeB · commit cd7c2da0165e · 2017-05-12T22:15:52.000Z
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.

llvm-svn: 302959
diff --git a/External/CUDA/lit.local.cfg b/External/CUDA/lit.local.cfg
@@ -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
diff --git a/External/Nurbs/CMakeLists.txt b/External/Nurbs/CMakeLists.txt
@@ -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()
diff --git a/External/Nurbs/lit.local.cfg b/External/Nurbs/lit.local.cfg
@@ -0,0 +1 @@
+config.traditional_output = True
diff --git a/External/Povray/CMakeLists.txt b/External/Povray/CMakeLists.txt
@@ -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()
diff --git a/External/Povray/lit.local.cfg b/External/Povray/lit.local.cfg
@@ -0,0 +1 @@
+config.traditional_output = True
diff --git a/External/SPEC/CMakeLists.txt b/External/SPEC/CMakeLists.txt
@@ -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}")
diff --git a/External/SPEC/lit.local.cfg b/External/SPEC/lit.local.cfg
diff --git a/External/skidmarks10/CMakeLists.txt b/External/skidmarks10/CMakeLists.txt
@@ -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()
diff --git a/MultiSource/CMakeLists.txt b/MultiSource/CMakeLists.txt
@@ -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}")
diff --git a/MultiSource/lit.local.cfg b/MultiSource/lit.local.cfg
@@ -0,0 +1 @@
+config.traditional_output = True
diff --git a/SingleSource/lit.local.cfg b/SingleSource/lit.local.cfg
@@ -1 +1,2 @@
+config.traditional_output = True
 config.single_source = True
diff --git a/lit.cfg b/lit.cfg
@@ -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']

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ if(TEST_SUITE_POVRAY_ROOT)`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`llvm_test_executable(povray ${Source})`
	`35`	`+`
	`36`	`+ file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")`
`35`	`37`	`endif()`