[test-suite] r264242 - cmake: Check that TEST_SUITE_RUN_TYPE has a supported value

[Matthias Braun via llvm-commits]

Author: matze
Date: Wed Mar 23 23:09:56 2016
New Revision: 264242

URL: http://llvm.org/viewvc/llvm-project?rev=264242&view=rev
Log:
cmake: Check that TEST_SUITE_RUN_TYPE has a supported value

Modified:
    test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt
    test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt
    test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt
    test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt
    test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt
    test-suite/trunk/External/SPEC/CMakeLists.txt

Modified: test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt?rev=264242&r1=264241&r2=264242&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt Wed Mar 23 23:09:56 2016
@@ -9,9 +9,6 @@ macro(cfp2000_subdir)
     set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CFP2000/${BENCHMARK})
     set(PROG ${BENCHMARK})
     file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
-    if(NOT DEFINED TEST_SUITE_RUN_TYPE)
-      set(TEST_SUITE_RUN_TYPE "train")
-    endif()
     llvm_add_subdirectories(${BENCHMARK})
   endforeach()
 endmacro()

Modified: test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt?rev=264242&r1=264241&r2=264242&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt Wed Mar 23 23:09:56 2016
@@ -31,9 +31,6 @@ macro(cpu2006_subdir)
     set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
     set(PROG ${BENCHMARK})
     file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp ${BENCHMARK_DIR}/src/*.cc)
-    if(NOT DEFINED RUN_TYPE)
-      set(RUN_TYPE "train")
-    endif()
     llvm_add_subdirectories(${BENCHMARK})
   endforeach()
 endmacro()

Modified: test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt?rev=264242&r1=264241&r2=264242&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt Wed Mar 23 23:09:56 2016
@@ -8,9 +8,6 @@ macro(cint2000_subdir)
     set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CINT2000/${BENCHMARK})
     set(PROG ${BENCHMARK})
     file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
-    if(NOT DEFINED TEST_SUITE_RUN_TYPE)
-      set(TEST_SUITE_RUN_TYPE train)
-    endif()
     llvm_add_subdirectories(${BENCHMARK})
   endforeach()
 endmacro()

Modified: test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt?rev=264242&r1=264241&r2=264242&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt Wed Mar 23 23:09:56 2016
@@ -31,9 +31,6 @@ macro(cpu2006_subdir)
     set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
     set(PROG ${BENCHMARK})
     file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
-    if(NOT DEFINED TEST_SUITE_RUN_TYPE)
-      set(TEST_SUITE_RUN_TYPE "train")
-    endif()
     llvm_add_subdirectories(${BENCHMARK})
   endforeach()
 endmacro()

Modified: test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt?rev=264242&r1=264241&r2=264242&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt Wed Mar 23 23:09:56 2016
@@ -5,9 +5,6 @@ macro(cint95_subdir)
     set(BENCHMARK_DIR ${TEST_SUITE_SPEC95_ROOT}/benchspec/CINT95/${BENCHMARK})
     set(PROG ${BENCHMARK})
     file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
-    if(NOT DEFINED TEST_SUITE_RUN_TYPE)
-      set(TEST_SUITE_RUN_TYPE "train")
-    endif()
     llvm_add_subdirectories(${BENCHMARK})
   endforeach()
 endmacro()

Modified: test-suite/trunk/External/SPEC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CMakeLists.txt?rev=264242&r1=264241&r2=264242&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CMakeLists.txt Wed Mar 23 23:09:56 2016
@@ -3,6 +3,14 @@ if(TARGET_OS STREQUAL "Darwin")
   list(APPEND CPPFLAGS -Wno-implicit-function-declaration)
 endif()
 
+# SPEC supports three "run types": ref, train and test
+if(NOT TEST_SUITE_RUN_TYPE STREQUAL "train" AND
+   NOT TEST_SUITE_RUN_TYPE STREQUAL "test" AND
+   NOT TEST_SUITE_RUN_TYPE STREQUAL "ref")
+  message(FATAL_ERROR
+          "TEST_SUITE_RUN_TYPE must be 'train', 'test' or 'ref' for SPEC")
+endif()
+
 llvm_externals_find(TEST_SUITE_SPEC95_ROOT "spec95" "SPEC CPU95")
 if(TEST_SUITE_SPEC95_ROOT)
   llvm_add_subdirectories(CINT95)