[test-suite] r254835 - RunSafely: Add option to omit exit status from output.
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Fri Dec 4 20:36:12 PST 2015
Author: matze
Date: Fri Dec 4 22:36:12 2015
New Revision: 254835
URL: http://llvm.org/viewvc/llvm-project?rev=254835&view=rev
Log:
RunSafely: Add option to omit exit status from output.
This is useful for external benchmark suites which bring reference files
for stdout without the llvm-test-suite convention of having an exit code
behind the stdout output.
As discussed in D14678 I am going for post-commit review as cmake/lit
test-suite support is still in early development.
Differential Revision: http://reviews.llvm.org/D14679
Added:
test-suite/trunk/External/Nurbs/lit.local.cfg
test-suite/trunk/External/Povray/lit.local.cfg
test-suite/trunk/External/skidmarks10/lit.local.cfg
test-suite/trunk/MultiSource/lit.local.cfg
test-suite/trunk/SingleSource/lit.local.cfg
Modified:
test-suite/trunk/External/Nurbs/CMakeLists.txt
test-suite/trunk/External/Povray/CMakeLists.txt
test-suite/trunk/External/skidmarks10/CMakeLists.txt
test-suite/trunk/MultiSource/CMakeLists.txt
test-suite/trunk/RunSafely.sh
test-suite/trunk/SingleSource/CMakeLists.txt
test-suite/trunk/lit.cfg
Modified: test-suite/trunk/External/Nurbs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Nurbs/CMakeLists.txt?rev=254835&r1=254834&r2=254835&view=diff
==============================================================================
--- test-suite/trunk/External/Nurbs/CMakeLists.txt (original)
+++ test-suite/trunk/External/Nurbs/CMakeLists.txt Fri Dec 4 22:36:12 2015
@@ -17,3 +17,4 @@ if(TEST_SUITE_NURBS_ROOT)
llvm_multisource()
endif()
+file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Added: test-suite/trunk/External/Nurbs/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Nurbs/lit.local.cfg?rev=254835&view=auto
==============================================================================
--- test-suite/trunk/External/Nurbs/lit.local.cfg (added)
+++ test-suite/trunk/External/Nurbs/lit.local.cfg Fri Dec 4 22:36:12 2015
@@ -0,0 +1 @@
+config.output_append_exitstatus = True
Modified: test-suite/trunk/External/Povray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Povray/CMakeLists.txt?rev=254835&r1=254834&r2=254835&view=diff
==============================================================================
--- test-suite/trunk/External/Povray/CMakeLists.txt (original)
+++ test-suite/trunk/External/Povray/CMakeLists.txt Fri Dec 4 22:36:12 2015
@@ -35,3 +35,4 @@ if(TEST_SUITE_POVRAY_ROOT)
llvm_multisource()
endif()
+file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Added: test-suite/trunk/External/Povray/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Povray/lit.local.cfg?rev=254835&view=auto
==============================================================================
--- test-suite/trunk/External/Povray/lit.local.cfg (added)
+++ test-suite/trunk/External/Povray/lit.local.cfg Fri Dec 4 22:36:12 2015
@@ -0,0 +1 @@
+config.output_append_exitstatus = True
Modified: test-suite/trunk/External/skidmarks10/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/skidmarks10/CMakeLists.txt?rev=254835&r1=254834&r2=254835&view=diff
==============================================================================
--- test-suite/trunk/External/skidmarks10/CMakeLists.txt (original)
+++ test-suite/trunk/External/skidmarks10/CMakeLists.txt Fri Dec 4 22:36:12 2015
@@ -15,3 +15,4 @@ if(TEST_SUITE_SKIDMARKS10_ROOT)
)
llvm_multisource()
endif()
+file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Added: test-suite/trunk/External/skidmarks10/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/skidmarks10/lit.local.cfg?rev=254835&view=auto
==============================================================================
--- test-suite/trunk/External/skidmarks10/lit.local.cfg (added)
+++ test-suite/trunk/External/skidmarks10/lit.local.cfg Fri Dec 4 22:36:12 2015
@@ -0,0 +1 @@
+config.output_append_exitstatus = True
Modified: test-suite/trunk/MultiSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/CMakeLists.txt?rev=254835&r1=254834&r2=254835&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/CMakeLists.txt Fri Dec 4 22:36:12 2015
@@ -11,3 +11,5 @@ endif()
llvm_multisource()
llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+
+file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Added: test-suite/trunk/MultiSource/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/lit.local.cfg?rev=254835&view=auto
==============================================================================
--- test-suite/trunk/MultiSource/lit.local.cfg (added)
+++ test-suite/trunk/MultiSource/lit.local.cfg Fri Dec 4 22:36:12 2015
@@ -0,0 +1 @@
+config.output_append_exitstatus = True
Modified: test-suite/trunk/RunSafely.sh
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/RunSafely.sh?rev=254835&r1=254834&r2=254835&view=diff
==============================================================================
--- test-suite/trunk/RunSafely.sh (original)
+++ test-suite/trunk/RunSafely.sh Fri Dec 4 22:36:12 2015
@@ -17,7 +17,7 @@
# Syntax:
#
# RunSafely.sh [-r <rhost>] [-l <ruser>] [-rc <client>] [-rp <port>]
-# [-u <under>] [--show-errors] -t <timeit>
+# [-u <under>] [--show-errors] [--omit-exitval] -t <timeit>
# <timeout> <infile> <outfile> <program> <args...>
#
# where:
@@ -35,6 +35,8 @@
#
# If --show-errors is given, then the output file will be printed if the command
# fails (returns a non-zero exit code).
+# Unless --omit-exitval is given the last line of the outfile has the form
+# "exit NN" with NN being the exit status number of the program.
if [ $# -lt 4 ]; then
echo "./RunSafely.sh [-t <PATH>] <timeout> <infile> <outfile>" \
@@ -54,6 +56,11 @@ RCLIENT=rsh
RUN_UNDER=
TIMEIT=
SHOW_ERRORS=0
+OMIT_EXITVAL=0
+if [ $1 = "--omit-exitval" ]; then
+ OMIT_EXITVAL=1
+ shift 1
+fi
if [ $1 = "-r" ]; then
RHOST=$2
shift 2
@@ -172,7 +179,9 @@ elif [ "$SHOW_ERRORS" -eq 1 -a "$exitval
else
fail=no
fi
-echo "exit $exitval" >> $OUTFILE
+if [ "$OMIT_EXITVAL" -ne 1 ]; then
+ echo "exit $exitval" >> $OUTFILE
+fi
# If we detected a failure, print the name of the test executable to the
# output file. This will cause it to compare as different with other runs
Modified: test-suite/trunk/SingleSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/CMakeLists.txt?rev=254835&r1=254834&r2=254835&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/CMakeLists.txt Fri Dec 4 22:36:12 2015
@@ -12,3 +12,5 @@ list(APPEND LDFLAGS -lm)
llvm_singlesource()
llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+
+file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Added: test-suite/trunk/SingleSource/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/lit.local.cfg?rev=254835&view=auto
==============================================================================
--- test-suite/trunk/SingleSource/lit.local.cfg (added)
+++ test-suite/trunk/SingleSource/lit.local.cfg Fri Dec 4 22:36:12 2015
@@ -0,0 +1 @@
+config.output_append_exitstatus = True
Modified: test-suite/trunk/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/lit.cfg?rev=254835&r1=254834&r2=254835&view=diff
==============================================================================
--- test-suite/trunk/lit.cfg (original)
+++ test-suite/trunk/lit.cfg Fri Dec 4 22:36:12 2015
@@ -110,6 +110,8 @@ def prepareRunSafely(config, commandline
runsafely = "%s/RunSafely.sh" % config.test_suite_root
runsafely_prefix = [ runsafely ]
+ if not config.output_append_exitstatus:
+ runsafely_prefix += ["--omit-exitval"]
if config.remote_host:
runsafely_prefix += [ "-r", config.remote_host ]
if config.remote_user:
@@ -215,5 +217,6 @@ config.name = 'test-suite'
config.test_format = TestSuiteTest()
config.suffixes = ['.test']
config.excludes = ['ABI-Testsuite']
+config.output_append_exitstatus = False
if 'SSH_AUTH_SOCK' in os.environ:
config.environment['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK']
More information about the llvm-commits
mailing list