test-suite: Eliminate the EXIT_OK RunSafely parameter.

 - Exit codes already get compared for tests, and only a few tests actually
   bother to set this.

llvm-svn: 166905

Author: ddunbar

LLVMSource/Makefile

@@ -5,7 +5,6 @@
 #
 LEVEL = ..
 DISABLE_FOR_LLVM_PROGRAMS := 1
-PROGRAM_REQUIRED_TO_EXIT_OK := 1
 REQUIRES_EH_SUPPORT := 1
 
 PROGRAMS_TO_TEST := $(basename $(wildcard *.ll))

Makefile.programs

@@ -88,16 +88,6 @@ REFERENCE_OUTPUT_KEY :=
 endif
 endif
 
-# RUNSAFELY - This program simply runs another program.  If the program works
-# correctly, this script has no effect, otherwise it will do things like print a
-# stack trace of a core dump.  It always returns "successful" so that tests will
-# continue to be run.
-ifdef PROGRAM_REQUIRED_TO_EXIT_OK
-EXIT_OK := 1
-else
-EXIT_OK := 0
-endif
-
 RUNSAFELY := $(PROGDIR)/RunSafely.sh
 RUNSAFELYLOCAL := $(PROGDIR)/RunSafely.sh
 
@@ -131,8 +121,8 @@ ifdef NO_WATCHDOG
 $(warning "NO_WATCHDOG make variable is no longer needed, please remove!")
 endif
 
-RUNSAFELY := $(RUNSAFELY) $(RUNTIMELIMIT) $(EXIT_OK)
-RUNSAFELYLOCAL := $(RUNSAFELYLOCAL) $(RUNTIMELIMIT) $(EXIT_OK)
+RUNSAFELY := $(RUNSAFELY) $(RUNTIMELIMIT)
+RUNSAFELYLOCAL := $(RUNSAFELYLOCAL) $(RUNTIMELIMIT)
 
 ifdef EXECUTION_ENVIRONMENT_OVERRIDES
 RUNSAFELY := $(RUNSAFELY) -u 'env $(EXECUTION_ENVIRONMENT_OVERRIDES)' $(RUNSAFELY)

MultiSource/Applications/obsequi/Makefile

@@ -12,5 +12,4 @@ endif
 LDFLAGS = -lsupc++
 LIBS += -lsupc++
 STDIN_FILENAME=$(PROJ_SRC_DIR)/input
-PROGRAM_REQUIRED_TO_EXIT_OK := 1
 include ../../Makefile.multisrc

RunSafely.sh

@@ -11,22 +11,14 @@
 #           fourth argument specified, and outputs a <outfile>.time file which
 #           contains a timing of the program and the program's exit code.
 #
-#           The <exitok> parameter specifies how the program's exit status
-#           is interpreted.  If the <exitok> parameter is non-zero, any
-#           non-zero exit status from the program is considered to indicate
-#           a test failure.  If the <exitok> parameter is zero, only exit
-#           statuses that indicates that the program could not be executed
-#           normally or that the program was terminated as a signal are
-#           considered to indicate a test failure.
-#
 #           If optional parameters -r <remote host> -l <remote user> are
 #           specified, it execute the program remotely using rsh.
 #
 # Syntax:
 #
 #   RunSafely.sh [-r <rhost>] [-l <ruser>] [-rc <client>] [-rp <port>]
 #                [-u <under>] [--show-errors] -t <timeit>
-#                <timeout> <exitok> <infile> <outfile> <program> <args...>
+#                <timeout> <infile> <outfile> <program> <args...>
 #
 #   where:
 #     <rhost>   is the remote host to execute the program
@@ -36,7 +28,6 @@
 #     <under>   is a wrapper that the program is run under
 #     <timeit>  is a wrapper that is used to collect timing data
 #     <timeout> is the maximum number of seconds to let the <program> run
-#     <exitok>  is 1 if the program must exit with 0 return code
 #     <infile>  is a file from which standard input is directed
 #     <outfile> is a file to which standard output and error are directed
 #     <program> is the path to the program to run
@@ -46,7 +37,7 @@
 # fails.
 
 if [ $# -lt 4 ]; then
-  echo "./RunSafely.sh [-t <PATH>] <timeout> <exitok> <infile> <outfile>" \
+  echo "./RunSafely.sh [-t <PATH>] <timeout> <infile> <outfile>" \
        "<program> <args...>"
   exit 1
 fi
@@ -99,11 +90,10 @@ if [ "$TIMEIT" = "" ]; then
 fi
 
 TIMELIMIT=$1
-EXITOK=$2
-INFILE=$3
-OUTFILE=$4
-PROGRAM=$5
-shift 5
+INFILE=$2
+OUTFILE=$3
+PROGRAM=$4
+shift 4
 SYSTEM=`uname -s`
 
 PROG=${PROGRAM}
@@ -179,8 +169,6 @@ elif test "$exitval" -eq 128 ; then
   echo "TEST $PROGRAM FAILED: exit status 128!"
 elif test "$exitval" -gt 128 ; then
   echo "TEST $PROGRAM FAILED: process terminated by signal (exit status $exitval)!"
-elif [ "$EXITOK" -ne 0 -a "$exitval" -ne 0 ] ; then
-  echo "TEST $PROGRAM FAILED: EXIT != 0"
 else
   fail=no
 fi

SingleSource/UnitTests/Makefile

@@ -32,7 +32,5 @@ ifneq ($(ARCH),x86_64)
 PROGRAMS_TO_SKIP += ms_struct-bitfield-init-1 ms_struct-bitfield-init ms_struct-bitfield ms_struct_pack_layout-1 ms_struct_pack_layout ms_struct-bitfield-1
 endif
 
-PROGRAM_REQUIRED_TO_EXIT_OK := 1
-
 LDFLAGS += -lstdc++
 include $(LEVEL)/SingleSource/Makefile.singlesrc

SingleSource/UnitTests/ObjC++/Makefile

@@ -5,7 +5,6 @@ include $(LEVEL)/Makefile.config
 DIRS :=
 
 LDFLAGS += -lstdc++ -lobjc -framework Foundation
-PROGRAM_REQUIRED_TO_EXIT_OK := 1
 
 # This is a known gcc / llvm-gcc miscompilation fixed in clang.
 ifdef CC_UNDER_TEST_IS_LLVM_GCC

SingleSource/UnitTests/ObjC/Makefile

@@ -6,7 +6,6 @@ DISABLE_JIT := 1
 DIRS :=
 
 LDFLAGS += -lobjc -framework Foundation
-PROGRAM_REQUIRED_TO_EXIT_OK := 1
 
 # This is a known gcc / llvm-gcc miscompilation fixed in clang.
 ifdef CC_UNDER_TEST_IS_LLVM_GCC