[test-suite] r338786 - cmake: Remove STDIN_FILENAME option and use shell syntax directly
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 2 16:47:15 PDT 2018
Author: matze
Date: Thu Aug 2 16:47:15 2018
New Revision: 338786
URL: http://llvm.org/viewvc/llvm-project?rev=338786&view=rev
Log:
cmake: Remove STDIN_FILENAME option and use shell syntax directly
Modified:
test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt
test-suite/trunk/cmake/modules/SingleMultiSource.cmake
Modified: test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -8,6 +8,5 @@ endif()
list(APPEND LDFLAGS -lstdc++)
set(PROG alacconvert-decode)
set(Sources EndianPortable.c ALACBitUtilities.c ALACDecoder.cpp ALACEncoder.cpp ag_dec.c ag_enc.c dp_dec.c dp_enc.c matrix_dec.c matrix_enc.c main.cpp CAFFileALAC.cpp)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf)
-set(RUN_OPTIONS - -)
+set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -8,6 +8,5 @@ endif()
list(APPEND LDFLAGS -lstdc++)
set(PROG alacconvert-encode)
set(Sources EndianPortable.c ALACBitUtilities.c ALACDecoder.cpp ALACEncoder.cpp ag_dec.c ag_enc.c dp_dec.c dp_enc.c matrix_dec.c matrix_enc.c main.cpp CAFFileALAC.cpp)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav)
-set(RUN_OPTIONS - -)
+set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -2,7 +2,7 @@ set(PROG burg)
list(APPEND CPPFLAGS -DDEBUG)
list(APPEND CFLAGS -std=gnu89)
list(APPEND LDFLAGS -lstdc++)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,6 +1,6 @@
set(PROG hexxagon)
set(REQUIRES_EH_SUPPORT 1)
list(APPEND LDFLAGS -lstdc++)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
llvm_multisource()
target_include_directories(hexxagon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
Modified: test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,6 +1,6 @@
set(PROG lambda)
list(APPEND LDFLAGS -lstdc++)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
llvm_multisource()
target_include_directories(lambda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
Modified: test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -9,5 +9,5 @@ endif()
if(NOT "${ARCH}" STREQUAL "PowerPC")
list(APPEND LDFLAGS -lsupc++)
endif()
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,6 +1,5 @@
set(PROG oggenc)
list(APPEND CFLAGS -fno-strict-aliasing)
list(APPEND LDFLAGS -lm)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune)
-set(RUN_OPTIONS "-Q -s 901820 -")
+set(RUN_OPTIONS -Q -s 901820 - < ${CMAKE_CURRENT_SOURCE_DIR}/tune)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,8 +1,7 @@
set(Source sqlite3.c shell.c)
set(PROG sqlite3)
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(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/commands)
-set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory:)
+set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory: < ${CMAKE_CURRENT_SOURCE_DIR}/commands)
set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
set(FP_TOLERANCE 1.0e-9)
set(GeneratedTestInputs ${CMAKE_CURRENT_BINARY_DIR}/test15.sql)
Modified: test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,8 +1,8 @@
set(PROG fhourstones3.1)
if(LARGE_PROBLEM_SIZE)
- set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large)
+ set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large)
else()
- set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/inputs)
+ set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/inputs)
endif()
if(ARCH STREQUAL "XCore")
set(XCORE_TARGET_NEEDS_MEMORY 64)
Modified: test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,4 @@
set(PROG fhourstones)
list(APPEND CPPFLAGS -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,5 +1,4 @@
set(PROG p2c)
list(APPEND CPPFLAGS -DNOMEMOPT)
-set(RUN_OPTIONS -v)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/mf.p)
+set(RUN_OPTIONS -v < ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/mf.p)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,6 +1,5 @@
set(PROG qbsort)
-set(RUN_OPTIONS 1000)
+set(RUN_OPTIONS 1000 < ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3)
list(APPEND LDFLAGS -lm)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3)
set(HASH_PROGRAM_OUTPUT 1)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,5 +1,5 @@
set(PROG bisect)
list(APPEND LDFLAGS -lm)
set(FP_TOLERANCE 0.001)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,4 @@
set(PROG vor)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3)
list(APPEND LDFLAGS -lm)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,4 @@
set(PROG bintr)
list(APPEND LDFLAGS -lm)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,6 +1,5 @@
set(PROG office-ispell)
list(APPEND CPPFLAGS -Dconst=)
list(APPEND LDFLAGS -lm)
-set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
+set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+ < ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,5 +1,5 @@
set(PROG telecomm-adpcm)
list(APPEND LDFLAGS -lm)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
set(HASH_PROGRAM_OUTPUT 1)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/employ/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,6 +1,5 @@
set(PROG employ)
list(APPEND LDFLAGS -lstdc++)
-set(RUN_OPTIONS 400)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
+set(RUN_OPTIONS 400 < ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
set(HASH_PROGRAM_OUTPUT 1)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,4 @@
list(APPEND CFLAGS -std=gnu89)
set(PROG cdecl)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/testset)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/testset)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,4 @@
set(PROG gnugo)
set(HASH_PROGRAM_OUTPUT 1)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/stdin)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/stdin)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,3 @@
set(PROG unix-smail)
-set(RUN_OPTIONS -v ALL)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
+set(RUN_OPTIONS -v ALL < ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,3 @@
set(PROG anagram)
-set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT)
+set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2 < ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,5 +1,5 @@
set(PROG bc)
set(OBJS scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/primes.b)
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/primes.b)
set(HASH_PROGRAM_OUTPUT 1)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -2,9 +2,8 @@ set(Source Calignm1.c constants.c defs.c
set(PROG pairlocalalign)
list(APPEND CPPFLAGS -DLLVM)
list(APPEND LDFLAGS -lm)
-set(RUN_OPTIONS -b 62 -g 0.100 -f 2.00 -h 0.100 -L)
+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(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/pyruvate_decarboxylase.fasta)
set(HASH_PROGRAM_OUTPUT 1)
if(ARCH STREQUAL "XCore")
set(XCORE_TARGET_NEEDS_MEMORY 256)
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,4 @@
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm )
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm )
set(PROG rawcaudio)
set(Source rawcaudio.c adpcm.c)
llvm_multisource()
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,4 +1,4 @@
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.adpcm )
+set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.adpcm )
set(PROG rawdaudio)
set(HASH_PROGRAM_OUTPUT 1)
set(Source rawdaudio.c adpcm.c)
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt Thu Aug 2 16:47:15 2018
@@ -1,5 +1,4 @@
-set(RUN_OPTIONS -4 -l)
-set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
+set(RUN_OPTIONS -4 -l < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
set(PROG encode)
set(Source encode.c g711.c g721.c g723_24.c g723_40.c g72x.c)
llvm_multisource()
Modified: test-suite/trunk/cmake/modules/SingleMultiSource.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/SingleMultiSource.cmake?rev=338786&r1=338785&r2=338786&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake (original)
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake Thu Aug 2 16:47:15 2018
@@ -66,13 +66,10 @@ macro(basename Var name)
string(REGEX REPLACE "\\.[^.]*$" "" ${Var} ${_filename})
endmacro()
-# Traditionally CMakeLists.txt files would set RUN_OPTIONS, STDIN_FILENAME,
-# SMALL_PROBLEM_SIZE, HASH_PROGRAM_OUTPUT, etc.
+# Traditionally CMakeLists.txt files would set RUN_OPTIONS, SMALL_PROBLEM_SIZE,
+# HASH_PROGRAM_OUTPUT, etc.
# Create llvm_test_run() and llvm_test_verify() invocation for that.
function(llvm_test_traditional name)
- if(STDIN_FILENAME)
- list(APPEND RUN_OPTIONS "< ${STDIN_FILENAME}")
- endif()
if(WORKDIR)
list(APPEND RUN_OPTIONS WORKDIR ${WORKDIR})
endif()
More information about the llvm-commits
mailing list