[test-suite] r263164 - cmake: Skip Regression subdirectory in BENCHMARKING_ONLY mode

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Thu Mar 10 13:03:48 PST 2016


Author: matze
Date: Thu Mar 10 15:03:47 2016
New Revision: 263164

URL: http://llvm.org/viewvc/llvm-project?rev=263164&view=rev
Log:
cmake: Skip Regression subdirectory in BENCHMARKING_ONLY mode

Instead of trying to list every benchmark in the subdirectories in
PROGRAMS_TO_SKIP (and failing to really list them all) simply do not
include the whole Regression directory in BENCHMARKING_ONLY mode.

Modified:
    test-suite/trunk/SingleSource/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt

Modified: test-suite/trunk/SingleSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/CMakeLists.txt?rev=263164&r1=263163&r2=263164&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/CMakeLists.txt Thu Mar 10 15:03:47 2016
@@ -1,5 +1,4 @@
-llvm_add_subdirectories(Regression Benchmarks)
+llvm_add_subdirectories(Benchmarks)
 if(NOT TEST_SUITE_BENCHMARKING_ONLY)
-  llvm_add_subdirectories(UnitTests)
+  llvm_add_subdirectories(UnitTests Regression)
 endif()
-

Modified: test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C%2B%2B/CMakeLists.txt?rev=263164&r1=263163&r2=263164&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt Thu Mar 10 15:03:47 2016
@@ -1,6 +1,3 @@
-if(TEST_SUITE_BENCHMARKING_ONLY)
-  list(APPEND PROGRAMS_TO_SKIP 2003-05-14-array-init 2003-05-14-expr_stmt 2003-06-08-BaseType 2003-06-08-VirtualFunctions 2003-06-13-Crasher 2003-08-20-EnumSizeProblem 2003-09-29-NonPODsByValue 2008-01-29-ParamAliasesReturn 2011-03-28-Bitfield BuiltinTypeInfo fixups global_ctor global_type ofstream_ctor pointer_member pointer_method pointer_method2 short_circuit_dtor)
-endif()
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
 

Modified: test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C%2B%2B/EH/CMakeLists.txt?rev=263164&r1=263163&r2=263164&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt Thu Mar 10 15:03:47 2016
@@ -1,6 +1,3 @@
 set(REQUIRES_EH_SUPPORT 1)
-if(TEST_SUITE_BENCHMARKING_ONLY)
-  list(APPEND PROGRAMS_TO_SKIP class_hierarchy ConditionalExpr ctor_dtor_count ctor_dtor_count-2 dead_try_block exception_spec_test function_try_block inlined_cleanup recursive-throw simple_rethrow simple_throw throw_rethrow_test)
-endif()
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()

Modified: test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt?rev=263164&r1=263163&r2=263164&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt Thu Mar 10 15:03:47 2016
@@ -3,8 +3,5 @@ if("${ARCH}" STREQUAL "x86")
     set(EXEC_XFAILS casts)
   endif()
 endif()
-if(TEST_SUITE_BENCHMARKING_ONLY)
-  list(APPEND PROGRAMS_TO_SKIP 2003-05-14-initialize-string 2003-05-21-BitfieldHandling 2003-05-21-UnionBitfields 2003-05-21-UnionTest 2003-05-22-LocalTypeTest 2003-05-22-VarSizeArray 2003-05-23-TransparentUnion 2003-06-16-InvalidInitializer 2003-06-16-VolatileError 2003-10-12-GlobalVarInitializers 2004-02-03-AggregateCopy 2004-03-15-IndirectGoto 2005-05-06-LongLongSignedShift 2008-01-07-LongDouble badidx bigstack callargs casts compare ConstructorDestructorAttributes DuffsDevice globalrefs matrixTranspose pointer_arithmetic PR10189 PR1386 PR491 PR640 sumarray sumarray2d sumarraymalloc test_indvars testtrace)
-endif()
 list(APPEND LDFLAGS -lm)
 llvm_singlesource()

Modified: test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/C%2B%2B11/CMakeLists.txt?rev=263164&r1=263163&r2=263164&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt Thu Mar 10 15:03:47 2016
@@ -1,6 +1,3 @@
 list(APPEND CPPFLAGS -std=c++11 -pthread)
-if(TEST_SUITE_BENCHMARKING_ONLY)
-  list(APPEND PROGRAMS_TO_SKIP stdthreadbug)
-endif()
 list(APPEND LDFLAGS -lstdc++ -pthread)
 llvm_singlesource()

Modified: test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt?rev=263164&r1=263163&r2=263164&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt Thu Mar 10 15:03:47 2016
@@ -1,5 +1,2 @@
-if(TEST_SUITE_BENCHMARKING_ONLY)
-  list(APPEND PROGRAMS_TO_SKIP aarch64_neon_intrinsics)
-endif()
 list(APPEND CFLAGS -std=c99)
 llvm_singlesource()

Modified: test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt?rev=263164&r1=263163&r2=263164&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt Thu Mar 10 15:03:47 2016
@@ -1,5 +1,2 @@
-if(TEST_SUITE_BENCHMARKING_ONLY)
-  list(APPEND PROGRAMS_TO_SKIP simple)
-endif()
 list(APPEND CFLAGS -std=c99)
 llvm_singlesource()




More information about the llvm-commits mailing list