[llvm-commits] [test-suite] r152989 - in /test-suite/trunk: Makefile.programs RunSafelyAndStable.sh

[Daniel Dunbar]

Author: ddunbar
Date: Sat Mar 17 11:38:01 2012
New Revision: 152989

URL: http://llvm.org/viewvc/llvm-project?rev=152989&view=rev
Log:
[test-suite] Eliminate GET_STABLE_NUMBERS and RunSafelyAndStable; this is just a hack, LNT does this better.

Removed:
    test-suite/trunk/RunSafelyAndStable.sh
Modified:
    test-suite/trunk/Makefile.programs

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=152989&r1=152988&r2=152989&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Sat Mar 17 11:38:01 2012
@@ -102,10 +102,6 @@
 EXIT_OK := 0
 endif
 
-ifdef GET_STABLE_NUMBERS
-RUNSAFELY := $(PROGDIR)/RunSafelyAndStable.sh $(RUNTIMELIMIT) $(EXIT_OK)
-RUNSAFELYLOCAL := $(PROGDIR)/RunSafelyAndStable.sh $(RUNTIMELIMIT) $(EXIT_OK)
-else
 RUNSAFELY := $(PROGDIR)/RunSafely.sh
 RUNSAFELYLOCAL := $(PROGDIR)/RunSafely.sh
 
@@ -143,7 +139,6 @@
 
 RUNSAFELY := $(RUNSAFELY) $(RUNTIMELIMIT) $(EXIT_OK)
 RUNSAFELYLOCAL := $(RUNSAFELYLOCAL) $(RUNTIMELIMIT) $(EXIT_OK)
-endif
 
 ifdef EXECUTION_ENVIRONMENT_OVERRIDES
 RUNSAFELY := $(RUNSAFELY) -u 'env $(EXECUTION_ENVIRONMENT_OVERRIDES)' $(RUNSAFELY)

Removed: test-suite/trunk/RunSafelyAndStable.sh
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/RunSafelyAndStable.sh?rev=152988&view=auto
==============================================================================
--- test-suite/trunk/RunSafelyAndStable.sh (original)
+++ test-suite/trunk/RunSafelyAndStable.sh (removed)
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Program:  RunSafelyAndStable.sh
-#
-# Synopsis: This script runs another program three times by repeatedly 
-#           invoking the RunSafely.sh script. It collects the timings of
-#           the program and reports the smallest one. The <outfile>.time
-#           file will reflect the time and result code of the fastest
-#           run.
-#
-# Syntax: 
-#   ./RunSafelyAndStable.sh <ulimit> <exitok> <infile> <outfile> \
-#      <program> <args...>
-#
-#   See the RunSafely.sh script for more details.
-#
-DIR=${0%%`basename $0`}
-ULIMIT=$1
-EXITOK=$2
-INFILE=$3
-OUTFILE=$4
-PROGRAM=$5
-shift 5
-
-# Run it the first time
-${DIR}/RunSafely.sh $ULIMIT $EXITOK $INFILE $OUTFILE $PROGRAM $*
-exitval=$?
-mv $OUTFILE.time $OUTFILE.time1
-TIME1=`grep program $OUTFILE.time1 | sed 's/^program//'`
-echo "Program $PROGRAM run #1 time: $TIME1"
-
-# Run it the second time
-${DIR}/RunSafely.sh $ULIMIT $EXITOK $INFILE $OUTFILE $PROGRAM $*
-mv $OUTFILE.time $OUTFILE.time2
-TIME2=`grep program $OUTFILE.time2 | sed 's/^program//'`
-echo "Program $PROGRAM run #2 time: $TIME2"
-
-# Run it the third time
-${DIR}/RunSafely.sh $ULIMIT $EXITOK $INFILE $OUTFILE $PROGRAM $*
-mv $OUTFILE.time $OUTFILE.time3
-TIME3=`grep program $OUTFILE.time3 | sed 's/^program//'`
-echo "Program $PROGRAM run #3 time: $TIME3"
-
-# Figure out which run had the smallest run time:
-SHORTEST=`echo -e "$TIME1 time1\n$TIME2 time2\n$TIME3 time3" | sort | 
-                head -1 | sed "s|.*time||"`
-
-echo "Program $PROGRAM run #$SHORTEST was fastest"
-cp $OUTFILE.time$SHORTEST $OUTFILE.time
-
-exit $exitval