[test-suite] r286142 - cmake: Enter subdirectories before setting up benchmark.

[Matthias Braun via llvm-commits]

Author: matze
Date: Mon Nov  7 14:41:05 2016
New Revision: 286142

URL: http://llvm.org/viewvc/llvm-project?rev=286142&view=rev
Log:
cmake: Enter subdirectories before setting up benchmark.

Perform add_subdirectory() calls before setting up
singlesource/multisource benchmarks to avoid settings of the parent
directory influencing independent benchmarks in the subdirectory. As far
as I can tell there is no problem today, but we should get used to the
safe style.

Modified:
    test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt

Modified: test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt?rev=286142&r1=286141&r2=286142&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt Mon Nov  7 14:41:05 2016
@@ -1,4 +1,4 @@
+llvm_add_subdirectories(Large)
+
 list(APPEND LDFLAGS -lm)
 llvm_singlesource()
-
-llvm_add_subdirectories(Large)

Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/CMakeLists.txt?rev=286142&r1=286141&r2=286142&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt Mon Nov  7 14:41:05 2016
@@ -1,3 +1,5 @@
+llvm_add_subdirectories(Large)
+
 list(APPEND LDFLAGS -lm -lstdc++)
 set(FP_ABSTOLERANCE 0.01)
 if(ARCH STREQUAL "XCore")
@@ -6,5 +8,3 @@ if(ARCH STREQUAL "XCore")
   endif()
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(Large)

Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/CMakeLists.txt?rev=286142&r1=286141&r2=286142&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt Mon Nov  7 14:41:05 2016
@@ -1,3 +1,5 @@
+llvm_add_subdirectories(EH)
+
 list(APPEND CXXFLAGS -Wno-deprecated)
 list(APPEND CPPFLAGS -Wno-deprecated)
 set(FP_TOLERANCE 0.00000001)
@@ -16,5 +18,3 @@ if(TARGET_OS STREQUAL "Darwin")
   list(APPEND LDFLAGS -Xlinker -stack_size -Xlinker 0x800000)
 endif()
 llvm_singlesource(PREFIX "shootout-cxx")
-
-llvm_add_subdirectories(EH)

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=286142&r1=286141&r2=286142&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt Mon Nov  7 14:41:05 2016
@@ -1,4 +1,4 @@
+llvm_add_subdirectories(EH)
+
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource(PREFIX "regression-cxx")
-
-llvm_add_subdirectories(EH)

Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt?rev=286142&r1=286141&r2=286142&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt Mon Nov  7 14:41:05 2016
@@ -1,7 +1,7 @@
+llvm_add_subdirectories(Large)
+
 execute_process(COMMAND date +%j OUTPUT_VARIABLE TMP1)
 set(SEED TMP1)
 set(RUN_OPTIONS 31415926)
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
-
-llvm_add_subdirectories(Large)