Create one diff per file to patch.

Add suggested fix for "dc" test.

PR:		7805
Submitted by:	Guy Helmer <ghelmer@scl.ameslab.gov>

4 files changed, 288 insertions, 0 deletions

diff --git a/benchmarks/bytebench/files/patch-ab b/benchmarks/bytebench/files/patch-ab
new file mode 100644
index 000000000000..062decfb4f86
--- /dev/null
+++ b/benchmarks/bytebench/files/patch-ab
@@ -0,0 +1,129 @@
+*** Run.orig	Wed Feb  5 11:08:46 1992
+--- Run	Fri Dec 18 22:48:52 1998
+***************
+*** 41,45 ****
+  #	awk cat cc chmod comm cp date dc df echo ed expr
+  #	kill ls make mkdir rm sed test time touch tty umask who
+! #       AND /bin/time
+  #  to generate result indexes, you will also need ...
+  #       join
+--- 41,45 ----
+  #	awk cat cc chmod comm cp date dc df echo ed expr
+  #	kill ls make mkdir rm sed test time touch tty umask who
+! #       AND /usr/bin/time
+  #  to generate result indexes, you will also need ...
+  #       join
+***************
+*** 51,55 ****
+  then
+     # determine flavor of UNIX from number of lines generated by /bin/tim
+!    Fcount=`/bin/time date 2>&1 | wc -l | sed 's/ //g'`
+     case "$Fcount"
+     in
+--- 51,55 ----
+  then
+     # determine flavor of UNIX from number of lines generated by /bin/tim
+!    Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
+     case "$Fcount"
+     in
+***************
+*** 68,75 ****
+  export FLAVOR
+  # check that the required files are in the proper places
+! if make check 
+!         then :
+!         else make all
+! fi
+  #
+  #
+--- 68,75 ----
+  export FLAVOR
+  # check that the required files are in the proper places
+! #if make check 
+! #        then :
+! #        else make all
+! #fi
+  #
+  #
+***************
+*** 93,97 ****
+  cd $PWD
+  
+! TMPDIR=${HOMEDIR}/tmp
+  cd $TMPDIR
+  TMPDIR=`pwd`
+--- 93,97 ----
+  cd $PWD
+  
+! TMPDIR=${TMPDIR-${HOMEDIR}/tmp}
+  cd $TMPDIR
+  TMPDIR=`pwd`
+***************
+*** 304,312 ****
+    C)  
+      logmsg="C Compiler Test"
+!     prog="looper ${looper-60} cc cctest.c"
+      stdout=/dev/null
+      repeat="$shortloop"
+      cleanopt="-m $TMPTIMES"
+!     rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
+      ;;
+  
+--- 304,312 ----
+    C)  
+      logmsg="C Compiler Test"
+!     prog="looper ${looper-60} cc cctest.c -o ${TMPDIR}/a.out"
+      stdout=/dev/null
+      repeat="$shortloop"
+      cleanopt="-m $TMPTIMES"
+!     rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
+      ;;
+  
+***************
+*** 324,329 ****
+    dc)  
+      logmsg="Dc: sqrt(2) to 99 decimal places"
+!     prog="looper ${looper-60} dc"
+!     stdin=dc.dat
+      stdout=/dev/null
+      cleanopt="-m $TMPTIMES"
+--- 324,329 ----
+    dc)  
+      logmsg="Dc: sqrt(2) to 99 decimal places"
+!     prog="looper ${looper-60} \"dc < ${TESTDIR}/dc.dat\""
+!     stdin=
+      stdout=/dev/null
+      cleanopt="-m $TMPTIMES"
+***************
+*** 418,426 ****
+            if test "$stdin" = ""  
+            then # without redirected stdin
+!              /bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
+            else # with redirected stdin
+!              /bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
+            fi 
+- 	  /bin/time $benchcmd
+  	  ###############################################
+  	  cd $pwd                    # move back home
+--- 418,425 ----
+            if test "$stdin" = ""  
+            then # without redirected stdin
+!              /usr/bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
+            else # with redirected stdin
+!              /usr/bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
+            fi 
+  	  ###############################################
+  	  cd $pwd                    # move back home
+***************
+*** 451,455 ****
+      in
+        C)
+!       rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
+        ;;
+  
+--- 451,455 ----
+      in
+        C)
+!       rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
+        ;;
+  
diff --git a/benchmarks/bytebench/files/patch-ac b/benchmarks/bytebench/files/patch-ac
new file mode 100644
index 000000000000..7cab0456099b
--- /dev/null
+++ b/benchmarks/bytebench/files/patch-ac
@@ -0,0 +1,15 @@
+*** pgms/tst.sh.orig	Wed Feb  5 11:08:39 1992
+--- pgms/tst.sh	Fri Dec 18 23:10:07 1998
+***************
+*** 15,19 ****
+  ###############################################################################
+  ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
+! sort >sort.$$ <sort.src
+  od sort.$$ | sort -n +1 > od.$$
+  grep the sort.$$ | tee grep.$$ | wc > wc.$$
+--- 15,19 ----
+  ###############################################################################
+  ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
+! sort >sort.$$ < ${TESTDIR}/sort.src
+  od sort.$$ | sort -n +1 > od.$$
+  grep the sort.$$ | tee grep.$$ | wc > wc.$$
diff --git a/benchmarks/unixbench/files/patch-ab b/benchmarks/unixbench/files/patch-ab
new file mode 100644
index 000000000000..062decfb4f86
--- /dev/null
+++ b/benchmarks/unixbench/files/patch-ab
@@ -0,0 +1,129 @@
+*** Run.orig	Wed Feb  5 11:08:46 1992
+--- Run	Fri Dec 18 22:48:52 1998
+***************
+*** 41,45 ****
+  #	awk cat cc chmod comm cp date dc df echo ed expr
+  #	kill ls make mkdir rm sed test time touch tty umask who
+! #       AND /bin/time
+  #  to generate result indexes, you will also need ...
+  #       join
+--- 41,45 ----
+  #	awk cat cc chmod comm cp date dc df echo ed expr
+  #	kill ls make mkdir rm sed test time touch tty umask who
+! #       AND /usr/bin/time
+  #  to generate result indexes, you will also need ...
+  #       join
+***************
+*** 51,55 ****
+  then
+     # determine flavor of UNIX from number of lines generated by /bin/tim
+!    Fcount=`/bin/time date 2>&1 | wc -l | sed 's/ //g'`
+     case "$Fcount"
+     in
+--- 51,55 ----
+  then
+     # determine flavor of UNIX from number of lines generated by /bin/tim
+!    Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
+     case "$Fcount"
+     in
+***************
+*** 68,75 ****
+  export FLAVOR
+  # check that the required files are in the proper places
+! if make check 
+!         then :
+!         else make all
+! fi
+  #
+  #
+--- 68,75 ----
+  export FLAVOR
+  # check that the required files are in the proper places
+! #if make check 
+! #        then :
+! #        else make all
+! #fi
+  #
+  #
+***************
+*** 93,97 ****
+  cd $PWD
+  
+! TMPDIR=${HOMEDIR}/tmp
+  cd $TMPDIR
+  TMPDIR=`pwd`
+--- 93,97 ----
+  cd $PWD
+  
+! TMPDIR=${TMPDIR-${HOMEDIR}/tmp}
+  cd $TMPDIR
+  TMPDIR=`pwd`
+***************
+*** 304,312 ****
+    C)  
+      logmsg="C Compiler Test"
+!     prog="looper ${looper-60} cc cctest.c"
+      stdout=/dev/null
+      repeat="$shortloop"
+      cleanopt="-m $TMPTIMES"
+!     rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
+      ;;
+  
+--- 304,312 ----
+    C)  
+      logmsg="C Compiler Test"
+!     prog="looper ${looper-60} cc cctest.c -o ${TMPDIR}/a.out"
+      stdout=/dev/null
+      repeat="$shortloop"
+      cleanopt="-m $TMPTIMES"
+!     rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
+      ;;
+  
+***************
+*** 324,329 ****
+    dc)  
+      logmsg="Dc: sqrt(2) to 99 decimal places"
+!     prog="looper ${looper-60} dc"
+!     stdin=dc.dat
+      stdout=/dev/null
+      cleanopt="-m $TMPTIMES"
+--- 324,329 ----
+    dc)  
+      logmsg="Dc: sqrt(2) to 99 decimal places"
+!     prog="looper ${looper-60} \"dc < ${TESTDIR}/dc.dat\""
+!     stdin=
+      stdout=/dev/null
+      cleanopt="-m $TMPTIMES"
+***************
+*** 418,426 ****
+            if test "$stdin" = ""  
+            then # without redirected stdin
+!              /bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
+            else # with redirected stdin
+!              /bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
+            fi 
+- 	  /bin/time $benchcmd
+  	  ###############################################
+  	  cd $pwd                    # move back home
+--- 418,425 ----
+            if test "$stdin" = ""  
+            then # without redirected stdin
+!              /usr/bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
+            else # with redirected stdin
+!              /usr/bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
+            fi 
+  	  ###############################################
+  	  cd $pwd                    # move back home
+***************
+*** 451,455 ****
+      in
+        C)
+!       rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
+        ;;
+  
+--- 451,455 ----
+      in
+        C)
+!       rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
+        ;;
+  
diff --git a/benchmarks/unixbench/files/patch-ac b/benchmarks/unixbench/files/patch-ac
new file mode 100644
index 000000000000..7cab0456099b
--- /dev/null
+++ b/benchmarks/unixbench/files/patch-ac
@@ -0,0 +1,15 @@
+*** pgms/tst.sh.orig	Wed Feb  5 11:08:39 1992
+--- pgms/tst.sh	Fri Dec 18 23:10:07 1998
+***************
+*** 15,19 ****
+  ###############################################################################
+  ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
+! sort >sort.$$ <sort.src
+  od sort.$$ | sort -n +1 > od.$$
+  grep the sort.$$ | tee grep.$$ | wc > wc.$$
+--- 15,19 ----
+  ###############################################################################
+  ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
+! sort >sort.$$ < ${TESTDIR}/sort.src
+  od sort.$$ | sort -n +1 > od.$$
+  grep the sort.$$ | tee grep.$$ | wc > wc.$$