Index: MultiSource/Applications/ALAC/decode/CMakeLists.txt =================================================================== --- MultiSource/Applications/ALAC/decode/CMakeLists.txt +++ MultiSource/Applications/ALAC/decode/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND CXXFLAGS -DTARGET_RT_BIG_ENDIAN=1) endif() list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf) +set(RUN_OPTIONS - - < tune.caf) llvm_multisource(alacconvert-decode EndianPortable.c ALACBitUtilities.c @@ -21,3 +21,4 @@ main.cpp CAFFileALAC.cpp ) +llvm_test_data(alacconvert-decode tune.caf) Index: MultiSource/Applications/ALAC/encode/CMakeLists.txt =================================================================== --- MultiSource/Applications/ALAC/encode/CMakeLists.txt +++ MultiSource/Applications/ALAC/encode/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND CXXFLAGS -DTARGET_RT_BIG_ENDIAN=1) endif() list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav) +set(RUN_OPTIONS - - < tune.wav) llvm_multisource(alacconvert-encode EndianPortable.c ALACBitUtilities.c @@ -21,3 +21,4 @@ main.cpp CAFFileALAC.cpp ) +llvm_test_data(alacconvert-encode tune.wav) Index: MultiSource/Applications/Burg/CMakeLists.txt =================================================================== --- MultiSource/Applications/Burg/CMakeLists.txt +++ MultiSource/Applications/Burg/CMakeLists.txt @@ -1,7 +1,8 @@ list(APPEND CPPFLAGS -DDEBUG) list(APPEND CFLAGS -std=gnu89) list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr) +set(RUN_OPTIONS < sample.gr) include_directories(${CMAKE_CURRENT_BINARY_DIR}) llvm_multisource(burg) +llvm_test_data(burg sample.gr) Index: MultiSource/Applications/ClamAV/CMakeLists.txt =================================================================== --- MultiSource/Applications/ClamAV/CMakeLists.txt +++ MultiSource/Applications/ClamAV/CMakeLists.txt @@ -1,24 +1,24 @@ list(APPEND CPPFLAGS -DHAVE_CONFIG_H -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/zlib -DDONT_LOCK_DBDIRS) set(INPUT - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.cab - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clamdoc.tar.gz - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.exe - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.exe.bz2 - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam-v2.rar - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam-v3.rar - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.zip - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/README - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc11.rtf - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc1.rtf - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc22.rtf - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc2.rtf - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/doc3.rtf - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/docCLAMexe.rtf - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/rtf1.rtf - ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/rtf-novirus.rtf + inputs/clam.cab + inputs/clamdoc.tar.gz + inputs/clam.exe + inputs/clam.exe.bz2 + inputs/clam-v2.rar + inputs/clam-v3.rar + inputs/clam.zip + inputs/README + inputs/rtf-test/Doc11.rtf + inputs/rtf-test/Doc1.rtf + inputs/rtf-test/Doc22.rtf + inputs/rtf-test/Doc2.rtf + inputs/rtf-test/doc3.rtf + inputs/rtf-test/docCLAMexe.rtf + inputs/rtf-test/rtf1.rtf + inputs/rtf-test/rtf-novirus.rtf ) -set(RUN_OPTIONS --debug --exclude-dir .svn --verbose -d${CMAKE_CURRENT_SOURCE_DIR}/dbdir -r ${INPUT}) +set(RUN_OPTIONS --debug --exclude-dir .svn --verbose -d${CMAKE_CURRENT_BINARY_DIR}/dbdir -r ${INPUT}) if(TARGET_OS STREQUAL "Darwin") list(APPEND CPPFLAGS -DC_DARWIN) endif() @@ -170,3 +170,5 @@ zlib_uncompr.c zlib_zutil.c ) +llvm_test_data(clamscan ${INPUT}) +llvm_test_data_dir(clamscan dbdir) Index: MultiSource/Applications/JM/ldecod/CMakeLists.txt =================================================================== --- MultiSource/Applications/JM/ldecod/CMakeLists.txt +++ MultiSource/Applications/JM/ldecod/CMakeLists.txt @@ -1,5 +1,5 @@ list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64) list(APPEND LDFLAGS -lm ${TOOLLINKOPTS}) -set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/data/test.264 -o Output/test_dec.yuv -r ${CMAKE_CURRENT_SOURCE_DIR}/data/test_rec.yuv) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) +set(RUN_OPTIONS -i data/test.264 -o Output/test_dec.yuv -r data/test_rec.yuv) llvm_multisource(ldecod) +llvm_test_data(ldecod data/test.264 data/test_rec.yuv) Index: MultiSource/Applications/JM/lencod/CMakeLists.txt =================================================================== --- MultiSource/Applications/JM/lencod/CMakeLists.txt +++ MultiSource/Applications/JM/lencod/CMakeLists.txt @@ -2,9 +2,14 @@ list(APPEND LDFLAGS -lm) set(FP_TOLERANCE 0.025) if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS -d ${CMAKE_CURRENT_SOURCE_DIR}/data/encoder_small.cfg -p InputFile=${CMAKE_CURRENT_SOURCE_DIR}/data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=${CMAKE_CURRENT_SOURCE_DIR}/data/leakybucketrate.cfg -p QmatrixFile=${CMAKE_CURRENT_SOURCE_DIR}/data/q_matrix.cfg) + set(RUN_OPTIONS -d data/encoder_small.cfg -p InputFile=data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=data/leakybucketrate.cfg -p QmatrixFile=data/q_matrix.cfg) else() - set(RUN_OPTIONS -d ${CMAKE_CURRENT_SOURCE_DIR}/data/encoder.cfg -p InputFile=${CMAKE_CURRENT_SOURCE_DIR}/data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=${CMAKE_CURRENT_SOURCE_DIR}/data/leakybucketrate.cfg -p QmatrixFile=${CMAKE_CURRENT_SOURCE_DIR}/data/q_matrix.cfg) + set(RUN_OPTIONS -d data/encoder.cfg -p InputFile=data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=data/leakybucketrate.cfg -p QmatrixFile=data/q_matrix.cfg) endif() -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) llvm_multisource(lencod) +if(SMALL_PROBLEM_SIZE) + llvm_test_data(lencod data/encoder_small.cfg) +else() + llvm_test_data(lencod data/encoder.cfg) +endif() +llvm_test_data(lencod data/foreman_part_qcif_444.yuv data/leakybucketrate.cfg data/q_matrix.cfg) Index: MultiSource/Applications/SIBsim4/CMakeLists.txt =================================================================== --- MultiSource/Applications/SIBsim4/CMakeLists.txt +++ MultiSource/Applications/SIBsim4/CMakeLists.txt @@ -1,6 +1,8 @@ if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x-small.fa ${CMAKE_CURRENT_SOURCE_DIR}/y-small.fa) + set(INPUTS x-small.fa y-small.fa) else() - set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x.fa ${CMAKE_CURRENT_SOURCE_DIR}/y.fa) + set(INPUTS x.fa y.fa) endif() +set(RUN_OPTIONS -A4 ${INPUTS}) llvm_multisource(SIBsim4) +llvm_test_data(SIBsim4 ${INPUTS}) Index: MultiSource/Applications/SPASS/CMakeLists.txt =================================================================== --- MultiSource/Applications/SPASS/CMakeLists.txt +++ MultiSource/Applications/SPASS/CMakeLists.txt @@ -2,9 +2,11 @@ list(APPEND CFLAGS -fno-strict-aliasing) list(APPEND LDFLAGS -lm) if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS "${CMAKE_CURRENT_SOURCE_DIR}/small_problem.dfg") + set(INPUTS small_problem.dfg) else() - set(RUN_OPTIONS "${CMAKE_CURRENT_SOURCE_DIR}/problem.dfg") + set(INPUTS problem.dfg) endif() +set(RUN_OPTIONS ${INPUTS}) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(SPASS) +llvm_test_data(SPASS ${INPUTS}) Index: MultiSource/Applications/d/CMakeLists.txt =================================================================== --- MultiSource/Applications/d/CMakeLists.txt +++ MultiSource/Applications/d/CMakeLists.txt @@ -1,5 +1,5 @@ list(APPEND CPPFLAGS -DD_BUILD_VERSION=5725) -set(RUN_OPTIONS -v ${CMAKE_CURRENT_SOURCE_DIR}/grammar.g) +set(RUN_OPTIONS -v grammar.g) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(make_dparser make_dparser.c @@ -15,3 +15,4 @@ version.c grammar.g.c ) +llvm_test_data(make_dparser grammar.g) Index: MultiSource/Applications/hbd/CMakeLists.txt =================================================================== --- MultiSource/Applications/hbd/CMakeLists.txt +++ MultiSource/Applications/hbd/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CPPFLAGS -DHAVE_CONFIG_H) list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/Sort.class) +set(RUN_OPTIONS Sort.class) llvm_multisource(hbd) +llvm_test_data(hbd Sort.class) Index: MultiSource/Applications/hexxagon/CMakeLists.txt =================================================================== --- MultiSource/Applications/hexxagon/CMakeLists.txt +++ MultiSource/Applications/hexxagon/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input) +set(RUN_OPTIONS < input) llvm_multisource(hexxagon) target_include_directories(hexxagon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +llvm_test_data(hexxagon input) Index: MultiSource/Applications/kimwitu++/CMakeLists.txt =================================================================== --- MultiSource/Applications/kimwitu++/CMakeLists.txt +++ MultiSource/Applications/kimwitu++/CMakeLists.txt @@ -1,6 +1,6 @@ list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DYYDEBUG=1) list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS -f test -o -v -s kcc ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f3.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f2.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f1.k) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) +set(RUN_OPTIONS -f test -o -v -s kcc inputs/f3.k inputs/f2.k inputs/f1.k) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(kc) +llvm_test_data(kc inputs/f3.k inputs/f2.k inputs/f1.k) Index: MultiSource/Applications/lambda-0.1.3/CMakeLists.txt =================================================================== --- MultiSource/Applications/lambda-0.1.3/CMakeLists.txt +++ MultiSource/Applications/lambda-0.1.3/CMakeLists.txt @@ -1,5 +1,5 @@ list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) +set(RUN_OPTIONS < input) llvm_multisource(lambda) target_include_directories(lambda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +llvm_test_data(lambda input) Index: MultiSource/Applications/lemon/CMakeLists.txt =================================================================== --- MultiSource/Applications/lemon/CMakeLists.txt +++ MultiSource/Applications/lemon/CMakeLists.txt @@ -1,5 +1,7 @@ if(NOT TEST_SUITE_BENCHMARKING_ONLY) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y ${CMAKE_CURRENT_SOURCE_DIR}/example1.y ${CMAKE_CURRENT_SOURCE_DIR}/example2.y ${CMAKE_CURRENT_SOURCE_DIR}/example3.y ${CMAKE_CURRENT_SOURCE_DIR}/example4.y ${CMAKE_CURRENT_SOURCE_DIR}/example5.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_configparser.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_mod_ssi_exprparser.y ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_dtd_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_mate_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/xapian_queryparser.lemony ${CMAKE_CURRENT_SOURCE_DIR}/ecmascript.y) + set(INPUTS parse.y example1.y example2.y example3.y example4.y example5.y lighttpd_configparser.y lighttpd_mod_ssi_exprparser.y wireshark_dtd_grammar.lemon wireshark_grammar.lemon wireshark_mate_grammar.lemon xapian_queryparser.lemony ecmascript.y) + set(RUN_OPTIONS ${INPUTS}) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(lemon lemon.c) + llvm_test_data(lemon ${INPUTS} lempar.c) endif() Index: MultiSource/Applications/lua/CMakeLists.txt =================================================================== --- MultiSource/Applications/lua/CMakeLists.txt +++ MultiSource/Applications/lua/CMakeLists.txt @@ -3,7 +3,6 @@ list(APPEND CPPFLAGS -DLUA_USE_POSIX) endif() set(RUN_OPTIONS alltests.lua "") -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) set(HASH_PROGRAM_OUTPUT 1) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generate_inputs.sh Index: MultiSource/Applications/minisat/CMakeLists.txt =================================================================== --- MultiSource/Applications/minisat/CMakeLists.txt +++ MultiSource/Applications/minisat/CMakeLists.txt @@ -1,12 +1,14 @@ list(APPEND LDFLAGS -lstdc++ -lm) if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS -verbosity=0 ${CMAKE_CURRENT_SOURCE_DIR}/small.cnf) + set(INPUT small.cnf) else() if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS -verbosity=0 ${CMAKE_CURRENT_SOURCE_DIR}/long.cnf) + set(INPUT long.cnf) else() - set(RUN_OPTIONS -verbosity=0 ${CMAKE_CURRENT_SOURCE_DIR}/short.cnf) + set(INPUT short.cnf) endif() endif() +set(RUN_OPTIONS -verbosity=0 ${INPUT}) set(FP_TOLERANCE 0.1) llvm_multisource(minisat) +llvm_test_data(minisat ${INPUT}) Index: MultiSource/Applications/oggenc/CMakeLists.txt =================================================================== --- MultiSource/Applications/oggenc/CMakeLists.txt +++ MultiSource/Applications/oggenc/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CFLAGS -fno-strict-aliasing) list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -Q -s 901820 - < ${CMAKE_CURRENT_SOURCE_DIR}/tune) +set(RUN_OPTIONS -Q -s 901820 - < tune) llvm_multisource(oggenc) +llvm_test_data(oggenc tune) Index: MultiSource/Applications/siod/CMakeLists.txt =================================================================== --- MultiSource/Applications/siod/CMakeLists.txt +++ MultiSource/Applications/siod/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CPPFLAGS -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix) list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -v1 ${CMAKE_CURRENT_SOURCE_DIR}/test.scm) +set(RUN_OPTIONS -v1 test.scm) llvm_multisource(siod) +llvm_test_data(siod test.scm) Index: MultiSource/Applications/spiff/CMakeLists.txt =================================================================== --- MultiSource/Applications/spiff/CMakeLists.txt +++ MultiSource/Applications/spiff/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/Sample.3 ${CMAKE_CURRENT_SOURCE_DIR}/Sample.4) +set(RUN_OPTIONS Sample.3 Sample.4) llvm_multisource(spiff) +llvm_test_data(spiff Sample.3 Sample.4) Index: MultiSource/Applications/sqlite3/CMakeLists.txt =================================================================== --- MultiSource/Applications/sqlite3/CMakeLists.txt +++ MultiSource/Applications/sqlite3/CMakeLists.txt @@ -1,6 +1,5 @@ list(APPEND CPPFLAGS -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -I.) -set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory: < ${CMAKE_CURRENT_SOURCE_DIR}/commands) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) +set(RUN_OPTIONS -init sqlite3rc :memory: < commands) set(FP_TOLERANCE 1.0e-9) set(GeneratedTestInputs ${CMAKE_CURRENT_BINARY_DIR}/test15.sql) @@ -19,3 +18,4 @@ shell.c ) add_dependencies(sqlite3 sqlite_input) +llvm_test_data(sqlite3 sqlite3rc commands) Index: MultiSource/Applications/treecc/CMakeLists.txt =================================================================== --- MultiSource/Applications/treecc/CMakeLists.txt +++ MultiSource/Applications/treecc/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS -n ${CMAKE_CURRENT_SOURCE_DIR}/examples/expr_cpp.tc) +set(RUN_OPTIONS -n examples/expr_cpp.tc) llvm_multisource(treecc) +llvm_test_data(treecc examples/expr_cpp.tc) Index: MultiSource/Applications/viterbi/CMakeLists.txt =================================================================== --- MultiSource/Applications/viterbi/CMakeLists.txt +++ MultiSource/Applications/viterbi/CMakeLists.txt @@ -1,2 +1,3 @@ -list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DPROJ_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") +list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DPROJ_SRC_DIR=".") llvm_multisource(viterbi) +llvm_test_data(viterbi Dist_demux) Index: MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt +++ MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/irsmk_input) +set(RUN_OPTIONS irsmk_input) llvm_multisource(IRSmk) +llvm_test_data(IRSmk irsmk_input) Index: MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file) +set(RUN_OPTIONS input-file) llvm_multisource(drop3) +llvm_test_data(drop3 input-file) Index: MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file) +set(RUN_OPTIONS input-file) llvm_multisource(five11) +llvm_test_data(five11 input-file) Index: MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file) +set(RUN_OPTIONS input-file) llvm_multisource(uudecode) +llvm_test_data(uudecode input-file) Index: MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt) +set(RUN_OPTIONS input.txt) llvm_multisource(uuencode) +llvm_test_data(uuencode input.txt) Index: MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT/CMakeLists.txt +++ MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/intermediate_leblanc.pnt) +set(RUN_OPTIONS intermediate_leblanc.pnt) llvm_multisource(PENNANT) +llvm_test_data(PENNANT intermediate_leblanc.pnt) Index: MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt +++ MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -x ${CMAKE_CURRENT_SOURCE_DIR}/medsmall1.adj_list) +set(RUN_OPTIONS -x medsmall1.adj_list) llvm_multisource(PathFinder) +llvm_test_data(PathFinder medsmall1.adj_list) Index: MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt +++ MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lm) list(APPEND CFLAGS -std=gnu99) -set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/default.in) +set(RUN_OPTIONS -i default.in) llvm_multisource(SimpleMOC) +llvm_test_data(SimpleMOC default.in) Index: MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt +++ MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt @@ -1,6 +1,8 @@ if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large) + set(INPUTS inputs_large) else() - set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/inputs) + set(INPUTS inputs) endif() +set(RUN_OPTIONS < ${INPUTS}) llvm_multisource(fhourstones3.1) +llvm_test_data(fhourstones3.1 ${INPUTS}) Index: MultiSource/Benchmarks/Fhourstones/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Fhourstones/CMakeLists.txt +++ MultiSource/Benchmarks/Fhourstones/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND CPPFLAGS -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input) +set(RUN_OPTIONS < input) llvm_multisource(fhourstones) +llvm_test_data(fhourstones input) Index: MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt +++ MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt @@ -1,7 +1,9 @@ list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost") if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in) + set(INPUTS ref.in) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in) + set(INPUTS test.in) endif() +set(RUN_OPTIONS ${INPUTS}) llvm_multisource(analyzer) +llvm_test_data(analyzer ${INPUTS}) Index: MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt +++ MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt @@ -1,9 +1,11 @@ list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost") list(APPEND LDFLAGS -lm) if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in) + set(INPUTS ref.in) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in) + set(INPUTS test.in) endif() +set(RUN_OPTIONS ${INPUTS}) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(distray) +llvm_test_data(distray ${INPUTS}) Index: MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt +++ MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt @@ -1,7 +1,9 @@ list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost") if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in) + set(INPUTS ref.in) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in) + set(INPUTS test.in) endif() +set(RUN_OPTIONS ${INPUTS}) llvm_multisource(fourinarow) +llvm_test_data(fourinarow ${INPUTS}) Index: MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt +++ MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt @@ -1,7 +1,9 @@ list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost") if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in) + set(INPUTS ref.in) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in) + set(INPUTS test.in) endif() +set(RUN_OPTIONS ${INPUTS}) llvm_multisource(mason) +llvm_test_data(mason ${INPUTS}) Index: MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt +++ MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt @@ -1,8 +1,10 @@ list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost") list(APPEND LDFLAGS -lm) if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in) + set(INPUTS ref.in) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in) + set(INPUTS test.in) endif() +set(RUN_OPTIONS ${INPUTS}) llvm_multisource(neural) +llvm_test_data(neural ${INPUTS}) Index: MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt +++ MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt @@ -1,8 +1,10 @@ list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost") list(APPEND LDFLAGS -lm) if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in) + set(INPUTS ref.in) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in) + set(INPUTS test.in) endif() +set(RUN_OPTIONS ${INPUTS}) llvm_multisource(pifft) +llvm_test_data(pifft ${INPUTS}) Index: MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CPPFLAGS -DNOMEMOPT) list(APPEND CFLAGS -std=gnu89) -set(RUN_OPTIONS -t ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/largest.espresso) +set(RUN_OPTIONS -t INPUT/largest.espresso) llvm_multisource(espresso) +llvm_test_data(espresso INPUT/largest.espresso) Index: MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt @@ -1,8 +1,8 @@ list(APPEND LDFLAGS -lm) -list(APPEND CPPFLAGS -DNOMEMOPT -DGS_LIB_DEFAULT="${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/fonts") +list(APPEND CPPFLAGS -DNOMEMOPT -DGS_LIB_DEFAULT=".:./fonts") list(APPEND CFLAGS -Wno-implicit-function-declaration) list(APPEND CPPFLAGS -DNOPRIVATE) -set(RUN_OPTIONS -DNODISPLAY ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/large.ps) +set(RUN_OPTIONS -DNODISPLAY INPUT/large.ps) llvm_multisource(gs gs.c gsmain.c @@ -69,3 +69,29 @@ gdevmem.c gdevs.c ) +llvm_test_data(gs + INPUT/large.ps + Fontmap + alphabet.ps + copyleft.ps + fcutils.ps + golfer.ps + prfont.ps + statusd.ps + bdftops.ps + decrypt.ps + gfonts.ps + lines.ps + ps2image.ps + traceop.ps + cheq.ps + empty.ps + ghost.ps + pcharstr.ps + pstoppm.ps + chess.ps + escher.ps + ghost2.ps + ppath.ps + quit.ps +) Index: MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt @@ -1,4 +1,5 @@ -set(RUN_OPTIONS 1000 < ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3) list(APPEND LDFLAGS -lm) +set(RUN_OPTIONS 1000 < benchmark.in3) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(qbsort) +llvm_test_data(qbsort benchmark.in3) Index: MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/testtrie.in2) +set(RUN_OPTIONS testtrie.in2) llvm_multisource(testtrie) +llvm_test_data(testtrie testtrie.in2) Index: MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lm) set(FP_TOLERANCE 0.001) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in) +set(RUN_OPTIONS < bisect_test.in) llvm_multisource(bisect) +llvm_test_data(bisect bisect_test.in) Index: MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt @@ -1,3 +1,4 @@ -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3) +set(RUN_OPTIONS < vor.in3) list(APPEND LDFLAGS -lm) llvm_multisource(vor) +llvm_test_data(vor vor.in3) Index: MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/trie.in1) +list(APPEND RUN_OPTIONS trie.in1) llvm_multisource(trie) +llvm_test_data(trie trie.in1) Index: MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1) +set(RUN_OPTIONS < bnchmrk.in1) llvm_multisource(bintr) +llvm_test_data(bintr bnchmrk.in1) Index: MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt @@ -1,3 +1,4 @@ -list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/sg01.imp) list(APPEND LDFLAGS -lm) +set(RUN_OPTIONS ./sg01.imp) llvm_multisource(imp) +llvm_test_data(imp sg01.imp sg01.pgm) Index: MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.pgm /dev/null -s) +set(RUN_OPTIONS input_large.pgm /dev/null -s) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(automotive-susan) +llvm_test_data(automotive-susan input_large.pgm) Index: MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -dct int -ppm -outfile /dev/null ${CMAKE_CURRENT_SOURCE_DIR}/input_large.jpg) +set(RUN_OPTIONS -dct int -ppm -outfile /dev/null input_large.jpg) llvm_multisource(consumer-jpeg) +llvm_test_data(consumer-jpeg input_large.jpg) Index: MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -DLAMESNDFILE) list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -S ${CMAKE_CURRENT_SOURCE_DIR}/large.wav /dev/null) +set(RUN_OPTIONS -S large.wav /dev/null) llvm_multisource(consumer-lame) +llvm_test_data(consumer-lame large.wav) Index: MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt @@ -1,5 +1,7 @@ list(APPEND CPPFLAGS -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR="lout.lib" -DFONT_DIR="font" -DMAPS_DIR="maps" -DINCL_DIR="include" -DDATA_DIR="data" -DHYPH_DIR="hyph" -DLOCALE_DIR="locale" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0 -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0) list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -x -I ${CMAKE_CURRENT_SOURCE_DIR}/data/include -D ${CMAKE_CURRENT_SOURCE_DIR}/data/data -F ${CMAKE_CURRENT_SOURCE_DIR}/data/font -C ${CMAKE_CURRENT_SOURCE_DIR}/data/maps -H ${CMAKE_CURRENT_SOURCE_DIR}/data/hyph ${CMAKE_CURRENT_SOURCE_DIR}/large.lout) +set(RUN_OPTIONS -x -I data/include -D data/data -F data/font -C data/maps -H data/hyph large.lout) llvm_multisource(consumer-typeset) +llvm_test_data(consumer-typeset large.lout) +llvm_test_data_dir(consumer-typeset data) Index: MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.dat) +set(RUN_OPTIONS input.dat) llvm_multisource(network-dijkstra) +llvm_test_data(network-dijkstra input.dat) Index: MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/large.udp) +set(RUN_OPTIONS large.udp) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(network-patricia) +llvm_test_data(network-patricia large.udp) Index: MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CPPFLAGS -Dconst=) list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+ < ${CMAKE_CURRENT_SOURCE_DIR}/large.txt) +set(RUN_OPTIONS -a -d americanmed+ < large.txt) llvm_multisource(office-ispell) +llvm_test_data(office-ispell americanmed+.hash large.txt) Index: MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/output_large.enc /dev/null d 1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321) +set(RUN_OPTIONS output_large.enc /dev/null d 1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(security-rijndael) +llvm_test_data(security-rijndael output_large.enc) Index: MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.asc ) +set(RUN_OPTIONS input_large.asc) llvm_multisource(security-sha) +llvm_test_data(security-sha input_large.asc) Index: MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/large.pcm) +set(RUN_OPTIONS large.pcm) llvm_multisource(telecomm-CRC32) +llvm_test_data(telecomm-CRC32 large.pcm) Index: MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm) +set(RUN_OPTIONS < large.adpcm) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(telecomm-adpcm) +llvm_test_data(telecomm-adpcm large.adpcm) Index: MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt @@ -1,5 +1,6 @@ list(APPEND CPPFLAGS -DSTUPID_COMPILER -DNeedFunctionPrototypes=1 -DSASR) list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -fps -c ${CMAKE_CURRENT_SOURCE_DIR}/large.au) +set(RUN_OPTIONS -fps -c large.au) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(telecomm-gsm) +llvm_test_data(telecomm-gsm large.au) Index: MultiSource/Benchmarks/PAQ8p/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/PAQ8p/CMakeLists.txt +++ MultiSource/Benchmarks/PAQ8p/CMakeLists.txt @@ -1,9 +1,11 @@ list(APPEND CPPFLAGS -DNOASM -DLLVM) list(APPEND LDFLAGS -lstdc++ -lm) if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS -1 ${CMAKE_CURRENT_SOURCE_DIR}/small.in) + set(INPUTS small.in) + set(RUN_OPTIONS -1 ${INPUTS}) else() - set(RUN_OPTIONS -4 ${CMAKE_CURRENT_SOURCE_DIR}/file1.in) + set(INPUTS file1.in) + set(RUN_OPTIONS -4 ${INPUTS}) endif() -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) llvm_multisource(paq8p) +llvm_test_data(paq8p ${INPUTS}) Index: MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND LDFLAGS -lstdc++) -set(RUN_OPTIONS 400 < ${CMAKE_CURRENT_SOURCE_DIR}/input.txt) +set(RUN_OPTIONS 400 < input.txt) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(employ) +llvm_test_data(employ input.txt) Index: MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt @@ -1,3 +1,4 @@ -set(RUN_OPTIONS -2 int ${CMAKE_CURRENT_SOURCE_DIR}/InstructionCombining.cpp.txt) +set(RUN_OPTIONS -2 int InstructionCombining.cpp.txt) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(agrep) +llvm_test_data(agrep InstructionCombining.cpp.txt) Index: MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y.in -v) +set(RUN_OPTIONS parse.y.in -v) llvm_multisource(mybison) +llvm_test_data(mybison parse.y.in) Index: MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt @@ -1,3 +1,4 @@ list(APPEND CFLAGS -std=gnu89) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/testset) +set(RUN_OPTIONS < testset) llvm_multisource(cdecl) +llvm_test_data(cdecl testset) Index: MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt @@ -1,3 +1,4 @@ set(HASH_PROGRAM_OUTPUT 1) -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/stdin) +set(RUN_OPTIONS < stdin) llvm_multisource(gnugo) +llvm_test_data(gnugo stdin) Index: MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS -v ALL < ${CMAKE_CURRENT_SOURCE_DIR}/main.c) +set(RUN_OPTIONS -v ALL < main.c) llvm_multisource(unix-smail) +llvm_test_data(unix-smail main.c) Index: MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt @@ -1,2 +1,3 @@ -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2 < ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT) +set(RUN_OPTIONS words 2 < input.OUT) llvm_multisource(anagram) +llvm_test_data(anagram words input.OUT) Index: MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt @@ -1,3 +1,4 @@ -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/primes.b) +set(RUN_OPTIONS < primes.b) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(bc) +llvm_test_data(bc primes.b) Index: MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt @@ -1,2 +1,3 @@ -list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/KL-4.in) +set(RUN_OPTIONS KL-4.in) llvm_multisource(ks) +llvm_test_data(ks KL-4.in) Index: MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CPPFLAGS -DTODD) -set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input2.in) +set(RUN_OPTIONS input2.in) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(yacr2) +llvm_test_data(yacr2 input2.in) Index: MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt +++ MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt @@ -1,6 +1,5 @@ set(FP_ABSTOLERANCE 0.00001) list(APPEND CFLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/../Common) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) llvm_multisource(hotspot hotspotKernel.c Index: MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt +++ MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt @@ -1,7 +1,6 @@ list(APPEND LDFLAGS -lm) set(FP_ABSTOLERANCE 0.00001) list(APPEND CFLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/../Common) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) llvm_multisource(srad main.c sradKernel.c Index: MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt +++ MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt @@ -1,10 +1,11 @@ if(LARGE_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 1400) + set(RUN_OPTIONS medium_inputs 1400) else() if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 100) + set(RUN_OPTIONS medium_inputs 100) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 900) + set(RUN_OPTIONS medium_inputs 900) endif() endif() llvm_multisource(netbench-url) +llvm_test_data(netbench-url medium_inputs) Index: MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt +++ MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt @@ -1,6 +1,7 @@ if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 2000) + set(RUN_OPTIONS input.txt 2000) else() - set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 20000) + set(RUN_OPTIONS input.txt 20000) endif() llvm_multisource(8b10b) +llvm_test_data(8b10b input.txt) Index: MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt +++ MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt @@ -1,7 +1,10 @@ list(APPEND LDFLAGS -lm) if(SMALL_PROBLEM_SIZE) - set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.train.in) + set(INPUTS dbms.train.in) + set(RUN_OPTIONS -i ${INPUTS}) else() - set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.ref.in) + set(INPUTS dbms.ref.in) + set(RUN_OPTIONS -i ${INPUTS}) endif() llvm_multisource(dbms) +llvm_test_data(dbms ${INPUTS}) Index: MultiSource/Benchmarks/mafft/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mafft/CMakeLists.txt +++ MultiSource/Benchmarks/mafft/CMakeLists.txt @@ -1,7 +1,6 @@ list(APPEND CPPFLAGS -DLLVM) list(APPEND LDFLAGS -lm) -set(RUN_OPTIONS -b 62 -g 0.100 -f 2.00 -h 0.100 -L < ${CMAKE_CURRENT_SOURCE_DIR}/pyruvate_decarboxylase.fasta) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) +set(RUN_OPTIONS -b 62 -g 0.100 -f 2.00 -h 0.100 -L < pyruvate_decarboxylase.fasta) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(pairlocalalign Calignm1.c @@ -32,3 +31,4 @@ suboptalign11.c tddis.c ) +llvm_test_data(pairlocalalign pyruvate_decarboxylase.fasta) Index: MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt @@ -1,5 +1,8 @@ -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm ) +set(RUN_OPTIONS < clinton.pcm) llvm_multisource(rawcaudio rawcaudio.c adpcm.c ) +llvm_test_data(rawcaudio SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../data + clinton.pcm +) Index: MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt @@ -1,6 +1,9 @@ -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.adpcm ) +set(RUN_OPTIONS < clinton.adpcm) set(HASH_PROGRAM_OUTPUT 1) llvm_multisource(rawdaudio rawdaudio.c adpcm.c ) +llvm_test_data(rawdaudio SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../data + clinton.adpcm +) Index: MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt @@ -1,4 +1,4 @@ -set(RUN_OPTIONS -4 -l < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm) +set(RUN_OPTIONS -4 -l < clinton.pcm) llvm_multisource(encode encode.c g711.c @@ -7,3 +7,6 @@ g723_40.c g72x.c ) +llvm_test_data(encode SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../data + clinton.pcm +) Index: MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt @@ -1,4 +1,4 @@ -set(RUN_OPTIONS -cpl ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm) +set(RUN_OPTIONS -cpl clinton.pcm) list(APPEND CPPFLAGS -DNeedFunctionPrototypes=1 -DSASR) llvm_multisource(toast add.c @@ -25,3 +25,6 @@ preprocess.c toast_audio.c ) +llvm_test_data(toast SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../data + clinton.pcm +) Index: MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt @@ -1,4 +1,4 @@ -set(RUN_OPTIONS -dct int -progressive -opt ${CMAKE_CURRENT_SOURCE_DIR}/../data/testimg.ppm) +set(RUN_OPTIONS -dct int -progressive -opt testimg.ppm) llvm_multisource(cjpeg jcapimin.c jcapistd.c @@ -55,3 +55,6 @@ rdswitch.c cdjpeg.c ) +llvm_test_data(cjpeg SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../data + testimg.ppm +) Index: MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt @@ -1,4 +1,4 @@ -set(RUN_OPTIONS -b ${CMAKE_CURRENT_SOURCE_DIR}/../data/mei16v2.m2v -r -f -o0 ${CMAKE_CURRENT_BINARY_DIR}/tmp%d) +set(RUN_OPTIONS -b mei16v2.m2v -r -f -o0 tmp%d) list(APPEND LDFLAGS -lm) llvm_multisource(mpeg2decode display.c @@ -18,3 +18,6 @@ spatscal.c systems.c ) +llvm_test_data(mpeg2decode SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../data + mei16v2.m2v +) Index: MultiSource/Benchmarks/nbench/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/nbench/CMakeLists.txt +++ MultiSource/Benchmarks/nbench/CMakeLists.txt @@ -1,12 +1,5 @@ list(APPEND CPPFLAGS -DBASE_ITERATIONS=25) list(APPEND LDFLAGS -lm) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) - -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/NNET.DAT - COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/NNET.DAT ${CMAKE_CURRENT_BINARY_DIR}/NNET.DAT - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Copying nbench test input") -add_custom_target(nbench_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/NNET.DAT) llvm_multisource(nbench) -add_dependencies(nbench nbench_input) +llvm_test_data(nbench NNET.DAT) Index: MultiSource/Benchmarks/sim/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/sim/CMakeLists.txt +++ MultiSource/Benchmarks/sim/CMakeLists.txt @@ -1,4 +1,5 @@ list(APPEND CPPFLAGS -DUNIX) -set(RUN_OPTIONS 8 ${CMAKE_CURRENT_SOURCE_DIR}/tob.38-44 ${CMAKE_CURRENT_SOURCE_DIR}/liv.42-48) -set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) +set(RUN_OPTIONS 8 tob.38-44 liv.42-48) llvm_multisource(sim) + +llvm_test_data(sim tob.38-44 liv.42-48) Index: cmake/modules/SingleMultiSource.cmake =================================================================== --- cmake/modules/SingleMultiSource.cmake +++ cmake/modules/SingleMultiSource.cmake @@ -68,9 +68,8 @@ # HASH_PROGRAM_OUTPUT, etc. # Create llvm_test_run() and llvm_test_verify() invocation for that. function(llvm_test_traditional name) - if(WORKDIR) - list(APPEND RUN_OPTIONS WORKDIR ${WORKDIR}) - endif() + # Always run in the same directory as the executable + list(INSERT RUN_OPTIONS 0 WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) llvm_test_run(${RUN_OPTIONS}) # Hash if we've been asked to. Index: cmake/modules/TestSuite.cmake =================================================================== --- cmake/modules/TestSuite.cmake +++ cmake/modules/TestSuite.cmake @@ -4,6 +4,25 @@ # ##===----------------------------------------------------------------------===## include(TestFile) +include(CopyDir) + +function(llvm_test_data target) + cmake_parse_arguments(_LTDARGS "" "SOURCE_DIR" "" ${ARGN}) + set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + if(_LTDARGS_SOURCE_DIR) + set(SOURCE_DIR ${_LTDARGS_SOURCE_DIR}) + endif() + foreach(file ${_LTDARGS_UNPARSED_ARGUMENTS}) + llvm_copy(${target} $/${file} ${SOURCE_DIR}/${file}) + endforeach() +endfunction() + +function(llvm_test_data_dir target) + set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + foreach(dir ${ARGN}) + llvm_copy_dir(${target} $/${dir} ${SOURCE_DIR}/${dir}) + endforeach() +endfunction() # Creates a new executable build target. Use this instead of `add_executable`. # It applies CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS. Creates a .test file if