Skip to content

Commit cd7c2da

Browse files
committed
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. llvm-svn: 302959
1 parent 631efe1 commit cd7c2da

File tree

12 files changed

+13
-8
lines changed

12 files changed

+13
-8
lines changed

External/CUDA/lit.local.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ cuda_env_vars = [
1515
for var in cuda_env_vars:
1616
if var in os.environ:
1717
config.environment[var] = os.environ[var]
18+
19+
config.traditional_output = True

External/Nurbs/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ if(ARCH STREQUAL "x86")
1717

1818
file(GLOB SOURCES ${TEST_SUITE_NURBS_ROOT}/*.cpp)
1919
llvm_test_executable(nurbs ${SOURCES})
20+
21+
file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
2022
endif()
2123
endif()

External/Nurbs/lit.local.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config.traditional_output = True

External/Povray/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ if(TEST_SUITE_POVRAY_ROOT)
3232
)
3333

3434
llvm_test_executable(povray ${Source})
35+
36+
file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
3537
endif()

External/Povray/lit.local.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config.traditional_output = True

External/SPEC/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,3 @@ if(TEST_SUITE_SPEC2006_ROOT)
4040
add_subdirectory(CINT2006)
4141
add_subdirectory(CFP2006)
4242
endif()
43-
44-
file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

External/SPEC/lit.local.cfg

-1
This file was deleted.

External/skidmarks10/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ if(TEST_SUITE_SKIDMARKS10_ROOT)
1010

1111
llvm_test_run(0 ${TEST_SUITE_SKIDMARKS10_ROOT}/golden
1212
WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
13-
llvm_test_verify(${FPCMP}
14-
%o
15-
${CMAKE_CURRENT_SOURCE_DIR}/skidmarks.reference_output
16-
)
1713
file(GLOB SOURCES ${TEST_SUITE_SKIDMARKS10_ROOT}/source/*.c)
1814
llvm_test_executable(skidmarks ${SOURCES})
1915
endif()

MultiSource/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ add_subdirectory(Benchmarks)
33
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
44
add_subdirectory(UnitTests)
55
endif()
6+
7+
file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

MultiSource/lit.local.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
config.traditional_output = True

SingleSource/lit.local.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
config.traditional_output = True
12
config.single_source = True

lit.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config.test_format = test.TestSuiteTest()
1010
config.suffixes = ['.test']
1111
config.excludes = ['ABI-Testsuite']
1212
config.remote_flags = ""
13-
config.traditional_output = True
13+
config.traditional_output = False
1414
config.single_source = False
1515
if 'SSH_AUTH_SOCK' in os.environ:
1616
config.environment['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK']

0 commit comments

Comments
 (0)