[test-suite] r264102 - cmake/lit: Specify work directories explicitely.

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 22 14:25:57 PDT 2016 

Author: matze
Date: Tue Mar 22 16:25:56 2016
New Revision: 264102

URL: http://llvm.org/viewvc/llvm-project?rev=264102&view=rev
Log:
cmake/lit: Specify work directories explicitely.

Specify the working directory explicitely (if the benchmark depends on
it) instead of relying on it magically being the directory of the
executable.  Remove the magic and do not change the working directory
unless requested.

Modified:
    test-suite/trunk/External/Povray/CMakeLists.txt
    test-suite/trunk/External/SPEC/CFP2006/447.dealII/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/CINT2006/456.hmmer/CMakeLists.txt
    test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt
    test-suite/trunk/External/skidmarks10/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/consumer-lame.reference_output
    test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt
    test-suite/trunk/cmake/modules/SingleMultiSource.cmake
    test-suite/trunk/litsupport/testplan.py

Modified: test-suite/trunk/External/Povray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Povray/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/External/Povray/CMakeLists.txt (original)
+++ test-suite/trunk/External/Povray/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -25,7 +25,7 @@ if(TEST_SUITE_POVRAY_ROOT)
   llvm_test_run(
     -I${TEST_SUITE_POVRAY_ROOT}/scenes/advanced/chess2.pov
     -L${TEST_SUITE_POVRAY_ROOT}/include
-    -GAoutput.junk -O-
+    -GA/dev/null -O-
   )
   llvm_test_verify(${FPCMP}
     %o

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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/447.dealII/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/447.dealII/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -20,6 +20,7 @@ macro(test_input run_type size)
   llvm_test_run(RUN_TYPE ${run_type}
     ${size}
     > ${CMAKE_CURRENT_BINARY_DIR}/log
+    WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
   )
   llvm_test_verify(RUN_TYPE ${run_type} ${FPCMP}
     ${BENCHMARK_DIR}/data/${run_type}/output/log

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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/181.mcf/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/181.mcf/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -2,6 +2,7 @@ macro(test_input run_type)
   llvm_test_run(RUN_TYPE ${run_type}
     ${BENCHMARK_DIR}/data/${run_type}/input/inp.in
     > ${CMAKE_CURRENT_BINARY_DIR}/inp.out
+    WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
   )
   llvm_test_verify(RUN_TYPE ${run_type} ${FPCMP}
     ${BENCHMARK_DIR}/data/${run_type}/output/mcf.out

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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/186.crafty/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/186.crafty/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -75,6 +75,7 @@ macro(test_input run_type)
   llvm_test_run(RUN_TYPE ${run_type}
     < ${BENCHMARK_DIR}/data/${run_type}/input/crafty.in
     > ${CMAKE_CURRENT_BINARY_DIR}/crafty.out
+    WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
   )
   llvm_test_verify(RUN_TYPE ${run_type} ${FPCMP}
     ${BENCHMARK_DIR}/data/${run_type}/output/crafty.out

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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -2,13 +2,15 @@ list(APPEND LDFLAGS -lm)
 
 macro(test_input run_type input output)
   # The benchmark modifies the data file, need to copy a fresh one
-  llvm_test_run(RUN_TYPE ${run_type} EXECUTABLE cp -f
+  llvm_test_run(RUN_TYPE ${run_type}
+    EXECUTABLE cp -f
     ${BENCHMARK_DIR}/data/${run_type}/input/${input}
     ${CMAKE_CURRENT_BINARY_DIR}/${input}
   )
   llvm_test_run(RUN_TYPE ${run_type}
     ${ARGN} ${input}
     > ${CMAKE_CURRENT_BINARY_DIR}/${output}
+    WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
   )
   llvm_test_verify(RUN_TYPE ${run_type} ${FPCMP}
     -r 0.002 -a 0.00001

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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/471.omnetpp/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -99,6 +99,7 @@ macro(test_input run_type)
   llvm_test_run(RUN_TYPE ${run_type}
     -f ${BENCHMARK_DIR}/data/${run_type}/input/omnetpp.ini
     > ${CMAKE_CURRENT_BINARY_DIR}/omnetpp.log
+    WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
   )
   llvm_test_verify(RUN_TYPE ${run_type} ${FPCMP}
     -r 0.00001 -a 0.000001

Modified: test-suite/trunk/External/skidmarks10/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/skidmarks10/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/External/skidmarks10/CMakeLists.txt (original)
+++ test-suite/trunk/External/skidmarks10/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -8,7 +8,8 @@ if(TEST_SUITE_SKIDMARKS10_ROOT)
     list(APPEND CPPFLAGS -msse3)
   endif()
 
-  llvm_test_run(0 ${TEST_SUITE_SKIDMARKS10_ROOT}/golden)
+  llvm_test_run(0 ${TEST_SUITE_SKIDMARKS10_ROOT}/golden
+    WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
   llvm_test_verify(${FPCMP}
     %o
     ${CMAKE_CURRENT_SOURCE_DIR}/skidmarks.reference_output

Modified: test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -2,6 +2,7 @@ set(PROG ldecod)
 set(CPPFLAGS -D __USE_LARGEFILE64 -D _FILE_OFFSET_BITS=64)
 set(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})
 if(ARCH STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()

Modified: test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -7,4 +7,5 @@ if(DEFINED SMALL_PROBLEM_SIZE)
 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)
 endif()
+set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/kimwitu%2B%2B/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -2,5 +2,6 @@ set(PROG kc)
 set(CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DYYDEBUG=1)
 set(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(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()

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=264102&r1=264101&r2=264102&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 Tue Mar 22 16:25:56 2016
@@ -1,4 +1,5 @@
 set(PROG lambda)
 list(APPEND LDFLAGS -lstdc++)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
+set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -7,6 +7,7 @@ else()
 endif()
 set(PROG lua)
 set(RUN_OPTIONS alltests.lua "")
+set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(HASH_PROGRAM_OUTPUT 1)
 set(DIFFPROG ${PROGDIR}/DiffOutput.sh "diff ")
 

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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -4,6 +4,7 @@ list(APPEND CPPFLAGS -DSTDC_HEADERS=1 -D
 set(LDFLAGS )
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/commands)
 set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory:)
+set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(FP_TOLERANCE 1.0e-9)
 set(GeneratedTestInputs ${CMAKE_CURRENT_BINARY_DIR}/test15.sql)
 if(DEFINED SMALL_PROBLEM_SIZE)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -1,5 +1,5 @@
 set(PROG automotive-susan)
 set(LDFLAGS -lm)
-set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.pgm Output/output_large.smoothing.pgm -s)
+set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.pgm /dev/null -s)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -1,4 +1,4 @@
 set(PROG consumer-jpeg)
 set(LDFLAGS -lm)
-set(RUN_OPTIONS -dct int -ppm -outfile Output/output_large_decode.ppm ${CMAKE_CURRENT_SOURCE_DIR}/input_large.jpg)
+set(RUN_OPTIONS -dct int -ppm -outfile /dev/null ${CMAKE_CURRENT_SOURCE_DIR}/input_large.jpg)
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -1,6 +1,6 @@
 set(PROG consumer-lame)
 set(CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE)
 set(LDFLAGS -lm)
-set(RUN_OPTIONS -S ${CMAKE_CURRENT_SOURCE_DIR}/large.wav Output/output_large.mp3)
+set(RUN_OPTIONS -S ${CMAKE_CURRENT_SOURCE_DIR}/large.wav /dev/null)
 set(USE_REFERENCE_OUTPUT 1)
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile Tue Mar 22 16:25:56 2016
@@ -3,7 +3,7 @@ LEVEL = ../../../..
 PROG     = consumer-lame
 CPPFLAGS = -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE
 LDFLAGS  = -lm
-RUN_OPTIONS = -S $(PROJ_SRC_DIR)/large.wav Output/output_large.mp3
+RUN_OPTIONS = -S $(PROJ_SRC_DIR)/large.wav /dev/null
 
 # Define USE_REFERENCE_OUTPUT which is a signal to Makefile.programs that the
 # natively compiled program should not be run but that its output should be

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/consumer-lame.reference_output
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/consumer-lame.reference_output?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/consumer-lame.reference_output (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/consumer-lame.reference_output Tue Mar 22 16:25:56 2016
@@ -1,5 +1,5 @@
 LAME version 3.70 (www.sulaco.org/mp3) 
 GPSYCHO: GPL psycho-acoustic and noise shaping model version 0.77. 
-Encoding large.wav to output_large.mp3
+Encoding large.wav to null
 Encoding as 44.1 kHz 128 kbps single-ch MPEG1 LayerIII ( 5.5x)  qval=5
 exit 0

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -1,5 +1,5 @@
 set(PROG security-rijndael)
 set(LDFLAGS -lm)
-set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/output_large.enc Output/output_large.dec d 1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321)
+set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/output_large.enc /dev/null d 1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -6,4 +6,5 @@ if(DEFINED SMALL_PROBLEM_SIZE)
 else()
   set(RUN_OPTIONS -4 ${CMAKE_CURRENT_SOURCE_DIR}/file1.in)
 endif()
+set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -2,6 +2,7 @@ set(Source Calignm1.c constants.c defs.c
 set(PROG pairlocalalign)
 set(CPPFLAGS -DLLVM)
 set(RUN_OPTIONS -b 62 -g 0.100 -f 2.00 -h 0.100 -L)
+set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/pyruvate_decarboxylase.fasta)
 set(LDFLAGS -lm)
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -6,11 +6,13 @@ if(ARCH STREQUAL "XCore")
 else()
   set(RUNTIMELIMIT 750)
 endif()
+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()
+
+llvm_multisource()
 add_dependencies(nbench nbench_input)

Modified: test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt Tue Mar 22 16:25:56 2016
@@ -2,4 +2,5 @@ set(PROG sim)
 set(CPPFLAGS -DUNIX)
 set(LDFLAGS )
 set(RUN_OPTIONS 8 ${CMAKE_CURRENT_SOURCE_DIR}/tob.38-44 ${CMAKE_CURRENT_SOURCE_DIR}/liv.42-48)
+set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 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=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake (original)
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake Tue Mar 22 16:25:56 2016
@@ -87,6 +87,9 @@ function(llvm_add_test name exename)
     if(DEFINED STDIN_FILENAME)
       list(APPEND RUN_OPTIONS "< ${STDIN_FILENAME}")
     endif()
+    if(WORKDIR)
+      list(APPEND RUN_OPTIONS WORKDIR ${WORKDIR})
+    endif()
     llvm_test_run(${RUN_OPTIONS})
 
     # Hash if we've been asked to.
@@ -240,4 +243,3 @@ macro(llvm_test_metric)
     set(TESTSCRIPT "${TESTSCRIPT}METRIC: ${ARGS_METRIC}: ${JOINED_ARGUMENTS}\n")
   endif()
 endmacro()
-  
\ No newline at end of file

Modified: test-suite/trunk/litsupport/testplan.py
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/litsupport/testplan.py?rev=264102&r1=264101&r2=264102&view=diff
==============================================================================
--- test-suite/trunk/litsupport/testplan.py (original)
+++ test-suite/trunk/litsupport/testplan.py Tue Mar 22 16:25:56 2016
@@ -86,10 +86,12 @@ def executeScript(context, script, useEx
     if len(script) == 0:
         return "", "", 0, None
 
-    execdir = os.path.dirname(context.test.getExecPath())
-    executeFunc = lit.TestRunner.executeScriptInternal
     if useExternalSh:
+        execdir = None
         executeFunc = lit.TestRunner.executeScript
+    else:
+        execdir = os.getcwd()
+        executeFunc = lit.TestRunner.executeScriptInternal
 
     res = executeFunc(context.test, context.litConfig, context.tmpBase, script,
                       execdir)

More information about the llvm-commits mailing list