[test-suite] r286278 - cmake: Do not use llvm_multisource() in External directory
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 8 11:46:19 PST 2016
Author: matze
Date: Tue Nov 8 13:46:18 2016
New Revision: 286278
URL: http://llvm.org/viewvc/llvm-project?rev=286278&view=rev
Log:
cmake: Do not use llvm_multisource() in External directory
llvm_test_executable() is enough for the things in the External
directory, there is no need to import the additional behaviours of
llvm_multisource().
Modified:
test-suite/trunk/External/HMMER/CMakeLists.txt
test-suite/trunk/External/Nurbs/CMakeLists.txt
test-suite/trunk/External/Povray/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2000/177.mesa/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2000/179.art/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2000/183.equake/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2000/188.ammp/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/433.milc/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/444.namd/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/447.dealII/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/450.soplex/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/453.povray/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/470.lbm/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/164.gzip/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/175.vpr/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/176.gcc/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/181.mcf/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/186.crafty/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/197.parser/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/254.gap/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/256.bzip2/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/401.bzip2/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/403.gcc/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/429.mcf/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/458.sjeng/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/462.libquantum/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/099.go/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/124.m88ksim/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/126.gcc/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/130.li/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/132.ijpeg/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/134.perl/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/147.vortex/CMakeLists.txt
test-suite/trunk/External/skidmarks10/CMakeLists.txt
Modified: test-suite/trunk/External/HMMER/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/HMMER/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/HMMER/CMakeLists.txt (original)
+++ test-suite/trunk/External/HMMER/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -1,13 +1,11 @@
llvm_externals_find(TEST_SUITE_HMMER_ROOT "hmmer" "HMMER 2.3.2")
if(TEST_SUITE_HMMER_ROOT)
- set(PROG hmmcalibrate)
- FILE(GLOB Source ${TEST_SUITE_HMMER_ROOT}/*.c)
list(APPEND CFLAGS -pthread)
list(APPEND LDFLAGS -pthread)
if(ARCH STREQUAL "PowerPC")
- list(APPEND TARGET_FLAGS -maltivec)
- list(APPEND LCCFLAGS -maltivec)
+ list(APPEND CFLAGS -maltivec)
+ list(APPEND LDFLAGS -maltivec)
endif()
if(ARCH STREQUAL "x86")
add_definitions(-DSSE2)
@@ -18,5 +16,6 @@ if(TEST_SUITE_HMMER_ROOT)
else()
llvm_test_run(--fixed 400 --cpu 1 --num 80000 --seed 1158818515 ${TEST_SUITE_HMMER_ROOT}/globin.hmm)
endif()
- llvm_multisource()
+ FILE(GLOB SOURCES ${TEST_SUITE_HMMER_ROOT}/*.c)
+ llvm_test_executable(hmmcalibrate ${SOURCES})
endif()
Modified: test-suite/trunk/External/Nurbs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Nurbs/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/Nurbs/CMakeLists.txt (original)
+++ test-suite/trunk/External/Nurbs/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -3,8 +3,6 @@ if(ARCH STREQUAL "x86")
llvm_externals_find(TEST_SUITE_NURBS_ROOT "nurbs" "Nurbs")
if(TEST_SUITE_NURBS_ROOT)
- set(PROG nurbs)
- file(GLOB Source ${TEST_SUITE_NURBS_ROOT}/*.cpp)
list(APPEND LDFLAGS -lstdc++)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND CPPFLAGS -DDWORD_IS_ULL)
@@ -16,6 +14,7 @@ if(ARCH STREQUAL "x86")
${CMAKE_CURRENT_SOURCE_DIR}/nurbs.reference_output
)
- llvm_multisource()
+ file(GLOB SOURCES ${TEST_SUITE_NURBS_ROOT}/*.cpp)
+ llvm_test_executable(nurbs ${SOURCES})
endif()
endif()
Modified: test-suite/trunk/External/Povray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Povray/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/Povray/CMakeLists.txt (original)
+++ test-suite/trunk/External/Povray/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -1,8 +1,6 @@
llvm_externals_find(TEST_SUITE_POVRAY_ROOT "povray31" "POV-Ray 3.1")
if(TEST_SUITE_POVRAY_ROOT)
- set(PROG povray)
-
file(GLOB Source
${TEST_SUITE_POVRAY_ROOT}/source/*.c
${TEST_SUITE_POVRAY_ROOT}/source/libpng/*.c
@@ -32,5 +30,5 @@ if(TEST_SUITE_POVRAY_ROOT)
${CMAKE_CURRENT_SOURCE_DIR}/povray.reference_output
)
- llvm_multisource()
+ llvm_test_executable(povray ${Source})
endif()
Modified: test-suite/trunk/External/SPEC/CFP2000/177.mesa/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/177.mesa/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2000/177.mesa/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2000/177.mesa/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -82,7 +82,7 @@ test_input(test 10)
test_input(train 500)
test_input(ref 1000)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
# The benchmark writes the output where the input files are, so we have to
# copy the data over.
Modified: test-suite/trunk/External/SPEC/CFP2000/179.art/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/179.art/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2000/179.art/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2000/179.art/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -55,4 +55,4 @@ test_input(ref ref.2.out
-objects 10
)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CFP2000/183.equake/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/183.equake/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2000/183.equake/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2000/183.equake/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -14,4 +14,4 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CFP2000/188.ammp/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/188.ammp/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2000/188.ammp/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2000/188.ammp/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -15,4 +15,4 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CFP2006/433.milc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/433.milc/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/433.milc/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/433.milc/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -17,4 +17,4 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CFP2006/444.namd/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/444.namd/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/444.namd/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/444.namd/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -34,4 +34,4 @@ test_input(test 1)
test_input(train 1)
test_input(ref 38)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CFP2006/447.dealII/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/447.dealII/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/447.dealII/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/447.dealII/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -41,4 +41,4 @@ test_input(test 8)
test_input(train 10)
test_input(ref 23)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CFP2006/450.soplex/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/450.soplex/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/450.soplex/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/450.soplex/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -24,7 +24,7 @@ test_input(train pds-20.mps pds-20.mps.o
test_input(ref ref.mps ref.out 0.02 0.0001 -m3500)
test_input(ref pds-50.mps pds-50.mps.out 0.02 0.0001 -s1 -e -m45000)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
macro(prepare_data run_type)
llvm_copy_dir(450.soplex
Modified: test-suite/trunk/External/SPEC/CFP2006/453.povray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/453.povray/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/453.povray/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/453.povray/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -20,7 +20,7 @@ test_input(test 0.0002)
test_input(train 0.00005)
test_input(ref 0.00005)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
include(CopyDir)
llvm_copy_dir(453.povray ${CMAKE_CURRENT_BINARY_DIR}/data/test/input
Modified: test-suite/trunk/External/SPEC/CFP2006/470.lbm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/470.lbm/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/470.lbm/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/470.lbm/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -19,4 +19,4 @@ test_input(test 20 reference.dat 0 1 1
test_input(train 300 reference.dat 0 1 100_100_130_cf_b.of)
test_input(ref 3000 reference.dat 0 0 100_100_130_ldc.of)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -36,16 +36,15 @@ foreach(s ${Source})
set_source_files_properties(${s} PROPERTIES COMPILE_DEFINITIONS __FILE__="${basename}")
endforeach()
-llvm_multisource()
-set(TARGET 482.sphinx3)
+llvm_test_executable(${PROG} ${Source})
macro(prepare_data run_type)
set(DESTDIR ${CMAKE_CURRENT_BINARY_DIR}/data/${run_type}/input)
- llvm_copy_dir(${TARGET} ${DESTDIR}/model
+ llvm_copy_dir(${PROG} ${DESTDIR}/model
${BENCHMARK_DIR}/data/all/input/model
)
- llvm_copy(${TARGET} ${DESTDIR} ${BENCHMARK_DIR}/data/${run_type}/input/args.an4)
- llvm_copy(${TARGET} ${DESTDIR} ${BENCHMARK_DIR}/data/${run_type}/input/beams.dat)
+ llvm_copy(${PROG} ${DESTDIR} ${BENCHMARK_DIR}/data/${run_type}/input/args.an4)
+ llvm_copy(${PROG} ${DESTDIR} ${BENCHMARK_DIR}/data/${run_type}/input/beams.dat)
# Create ctlfile and copy .raw files depending on endianess
if(IS_BIGENDIAN)
file(GLOB files "${BENCHMARK_DIR}/data/${run_type}/input/*.be.raw")
@@ -56,7 +55,7 @@ macro(prepare_data run_type)
foreach(f ${files})
get_filename_component(basename ${f} NAME)
string(REGEX REPLACE ".(be|le).raw$" "" basename "${basename}")
- llvm_copy(${TARGET} ${DESTDIR}/${basename}.raw ${f})
+ llvm_copy(${PROG} ${DESTDIR}/${basename}.raw ${f})
# Determine file size...
file(READ ${f} content HEX)
string(LENGTH ${content} content_length)
Modified: test-suite/trunk/External/SPEC/CINT2000/164.gzip/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/164.gzip/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/164.gzip/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/164.gzip/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -18,4 +18,4 @@ test_input(ref input.graphic 60)
test_input(ref input.random 60)
test_input(ref input.program 60)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/175.vpr/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/175.vpr/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/175.vpr/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/175.vpr/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -43,7 +43,7 @@ test_input(ref 0.05)
test_input(train 0.05)
test_input(test 0.10)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
# The benchmark writes the output where the input files are, so we have to
# copy the data over.
Modified: test-suite/trunk/External/SPEC/CINT2000/176.gcc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/176.gcc/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/176.gcc/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/176.gcc/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -28,4 +28,4 @@ test_input(ref scilab.i scilab.s)
test_input(train cp-decl.i cp-decl.s)
test_input(test cccp.i cccp.s)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/181.mcf/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/181.mcf/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/181.mcf/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/181.mcf/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -18,4 +18,4 @@ test_input(ref)
test_input(train)
test_input(test)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/186.crafty/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/186.crafty/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/186.crafty/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/186.crafty/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -87,4 +87,4 @@ test_input(ref)
test_input(train)
test_input(test)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/197.parser/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/197.parser/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/197.parser/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/197.parser/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -19,4 +19,4 @@ test_input(ref)
test_input(train)
test_input(test)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -185,4 +185,4 @@ test_input(ref)
test_input(train)
test_input(test)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -154,14 +154,14 @@ foreach(input ${inputs})
)
endforeach()
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
include(CopyDir)
-llvm_copy_dir(253.perlbmk ${CMAKE_CURRENT_BINARY_DIR}/data/test/input
+llvm_copy_dir(${PROG} ${CMAKE_CURRENT_BINARY_DIR}/data/test/input
${BENCHMARK_DIR}/data/all/input
${BENCHMARK_DIR}/data/test/input
)
-llvm_copy_dir(253.perlbmk ${CMAKE_CURRENT_BINARY_DIR}/data/ref/input
+llvm_copy_dir(${PROG} ${CMAKE_CURRENT_BINARY_DIR}/data/ref/input
${BENCHMARK_DIR}/data/all/input
${BENCHMARK_DIR}/data/ref/input
)
Modified: test-suite/trunk/External/SPEC/CINT2000/254.gap/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/254.gap/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/254.gap/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/254.gap/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -29,4 +29,4 @@ test_input(ref 192M)
test_input(train 128M)
test_input(test 64M)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -25,9 +25,9 @@ test_input(ref ${endianname}1.raw vortex
test_input(ref ${endianname}2.raw vortex2.out)
test_input(ref ${endianname}3.raw vortex3.out)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
# The benchmark writes the output where the input files are, so we have to
# copy the data over.
include(CopyDir)
-llvm_copy_dir(255.vortex ${CMAKE_CURRENT_BINARY_DIR}/data ${BENCHMARK_DIR}/data)
+llvm_copy_dir(${PROG} ${CMAKE_CURRENT_BINARY_DIR}/data ${BENCHMARK_DIR}/data)
Modified: test-suite/trunk/External/SPEC/CINT2000/256.bzip2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/256.bzip2/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/256.bzip2/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/256.bzip2/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -16,4 +16,4 @@ test_input(ref input.source 58)
test_input(ref input.graphic 58)
test_input(ref input.program 58)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -20,9 +20,9 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
# The benchmark writes the output where the input files are, so we have to
# copy the data over.
include(CopyDir)
-llvm_copy_dir(300.twolf ${CMAKE_CURRENT_BINARY_DIR}/data ${BENCHMARK_DIR}/data)
+llvm_copy_dir(${PROG} ${CMAKE_CURRENT_BINARY_DIR}/data ${BENCHMARK_DIR}/data)
Modified: test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -139,8 +139,7 @@ foreach(input ${inputs})
)
endforeach()
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
include(CopyDir)
-llvm_copy_dir(400.perlbench ${CMAKE_CURRENT_BINARY_DIR}/data
- ${BENCHMARK_DIR}/data)
+llvm_copy_dir(${PROG} ${CMAKE_CURRENT_BINARY_DIR}/data ${BENCHMARK_DIR}/data)
Modified: test-suite/trunk/External/SPEC/CINT2006/401.bzip2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/401.bzip2/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/401.bzip2/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/401.bzip2/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -24,4 +24,4 @@ test_input(ref ${BENCHMARK_DIR}/data/all
test_input(ref ${BENCHMARK_DIR}/data/ref/input/text.html 280 text.html.out)
test_input(ref ${BENCHMARK_DIR}/data/all/input/input.combined 200 input.combined.out)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/403.gcc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/403.gcc/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/403.gcc/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/403.gcc/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -33,4 +33,4 @@ test_input(ref g23.in g23.s)
test_input(ref s04.in s04.s)
test_input(ref scilab.in scilab.s)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/429.mcf/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/429.mcf/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/429.mcf/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/429.mcf/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -20,4 +20,4 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -41,4 +41,4 @@ foreach(tstfile IN ITEMS
test_input(ref ${tstfile} ${basename}.out)
endforeach()
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -38,4 +38,4 @@ test_input(ref retro.hmm retro.out
--fixed 0 --mean 500 --num 500000 --sd 350 --seed 0
)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/458.sjeng/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/458.sjeng/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/458.sjeng/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/458.sjeng/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -13,4 +13,4 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/462.libquantum/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/462.libquantum/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/462.libquantum/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/462.libquantum/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -20,4 +20,4 @@ test_input(test 33 5)
test_input(train 143 25)
test_input(ref 1397 8)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -24,7 +24,7 @@ test_input(ref foreman_ref_ baseline)
test_input(ref foreman_ref_ main)
test_input(ref sss_ main)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
# TODO: This will copy a bit more than 50M of data, maybe we should symlink it?
include(CopyDir)
Modified: test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -117,4 +117,4 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -17,4 +17,4 @@ test_input(train rivers1.cfg rivers1.out
test_input(ref BigLakes2048.cfg BigLakes2048.out)
test_input(ref rivers.cfg rivers.out)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/483.xalancbmk/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -44,4 +44,4 @@ test_input(test test.xml test.out)
test_input(train allbooks.xml train.out)
test_input(ref t5.xml ref.out)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/099.go/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/099.go/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/099.go/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/099.go/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -16,4 +16,4 @@ test_input(ref 5stone21.in 5stone21.out
test_input(ref 9stone21.in 9stone21.out 50 21)
test_input(ref null.in null.out 50 21)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/124.m88ksim/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/124.m88ksim/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/124.m88ksim/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/124.m88ksim/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -125,4 +125,4 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/126.gcc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/126.gcc/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/126.gcc/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/126.gcc/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -23,4 +23,4 @@ foreach(input ${inputs})
test_input(ref ${basename}.o ${basename}.s)
endforeach()
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/129.compress/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -17,4 +17,4 @@ test_input(test test.in test.out)
test_input(train test.in test.out)
test_input(ref bigtest.in bigtest.out)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/130.li/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/130.li/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/130.li/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/130.li/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -21,4 +21,4 @@ test_input(ref au.lsp boyer.lsp browse.l
destrum1.lsp destrum2.lsp div2.lsp puzzle0.lsp puzzle1.lsp
tak0.lsp tak1.lsp tak2.lsp takr.lsp triang.lsp xit.lsp)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/132.ijpeg/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/132.ijpeg/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/132.ijpeg/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/132.ijpeg/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -96,4 +96,4 @@ test_input(ref penguin.ppm penguin.out)
test_input(ref specmun.ppm specmun.out)
test_input(ref vigo.ppm vigo.out)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/134.perl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/134.perl/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/134.perl/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/134.perl/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -21,4 +21,4 @@ test_input(train scrabbl)
test_input(ref primes)
test_input(ref scrabbl)
-llvm_multisource()
+llvm_test_executable(${PROG} ${Source})
Modified: test-suite/trunk/External/SPEC/CINT95/147.vortex/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/147.vortex/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/147.vortex/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/147.vortex/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -1,3 +1,4 @@
+list(APPEND LDFLAGS -lm)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
add_definitions(-D__RISC_64__)
endif()
@@ -23,10 +24,9 @@ test_input(test)
test_input(train)
test_input(ref)
-llvm_multisource()
-target_link_libraries(147.vortex m)
+llvm_test_executable(${PROG} ${Source})
# The benchmark writes the output where the input files are, so we have to
# copy the data over.
include(CopyDir)
-llvm_copy_dir(147.vortex ${CMAKE_CURRENT_BINARY_DIR}/data ${BENCHMARK_DIR}/data)
+llvm_copy_dir(${PROG} ${CMAKE_CURRENT_BINARY_DIR}/data ${BENCHMARK_DIR}/data)
Modified: test-suite/trunk/External/skidmarks10/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/skidmarks10/CMakeLists.txt?rev=286278&r1=286277&r2=286278&view=diff
==============================================================================
--- test-suite/trunk/External/skidmarks10/CMakeLists.txt (original)
+++ test-suite/trunk/External/skidmarks10/CMakeLists.txt Tue Nov 8 13:46:18 2016
@@ -2,7 +2,6 @@ llvm_externals_find(TEST_SUITE_SKIDMARKS
if(TEST_SUITE_SKIDMARKS10_ROOT)
set(PROG skidmarks)
- file(GLOB Source ${TEST_SUITE_SKIDMARKS10_ROOT}/source/*.c)
list(APPEND CPPFLAGS -I${TEST_SUITE_SKIDMARKS10_ROOT}/source)
if(ARCH STREQUAL "x86")
list(APPEND CFLAGS -msse3)
@@ -14,5 +13,6 @@ if(TEST_SUITE_SKIDMARKS10_ROOT)
%o
${CMAKE_CURRENT_SOURCE_DIR}/skidmarks.reference_output
)
- llvm_multisource()
+ file(GLOB SOURCES ${TEST_SUITE_SKIDMARKS10_ROOT}/source/*.c)
+ llvm_test_executable(skidmarks ${SOURCES})
endif()
More information about the llvm-commits
mailing list