From: Ben Pfaff <blp@gnu.org>
Date: Tue, 17 Feb 2004 05:38:31 +0000 (+0000)
Subject: Prepend $SUPERVISOR to invocations of pspp so that we
X-Git-Tag: v0.4.0~350
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c48bf64ab648b9b761a8e0774db3672d8009c64c;p=pspp-builds.git

Prepend $SUPERVISOR to invocations of pspp so that we
can run valgrind or gdb easily with `make check'.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0545202e..f92371b1 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 16 21:36:57 2004  Ben Pfaff  <blp@gnu.org>
+
+	* */*.sh: Prepend $SUPERVISOR to invocations of pspp so that we
+	can run valgrind or gdb easily with `make check'
+
 Sat Dec 13 00:08:23 2003  Ben Pfaff  <blp@gnu.org>
 
 	* syntax: Run a diff when there's no expected output, too.
diff --git a/tests/bugs/alpha-freq.sh b/tests/bugs/alpha-freq.sh
index f292563b..102f98ba 100755
--- a/tests/bugs/alpha-freq.sh
+++ b/tests/bugs/alpha-freq.sh
@@ -60,7 +60,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$here/../src/pspp $TEMPDIR/prog.sps
+$SUPERVISOR $here/../src/pspp $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then fail ; fi
 
 
diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh
index 4bd6e47e..a850750d 100755
--- a/tests/bugs/crosstabs.sh
+++ b/tests/bugs/crosstabs.sh
@@ -73,7 +73,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$here/../src/pspp $TEMPDIR/ct.stat
+$SUPERVISOR $here/../src/pspp $TEMPDIR/ct.stat
 if [ $? -ne 0 ] ; then fail ; fi
 
 
diff --git a/tests/bugs/data-crash.sh b/tests/bugs/data-crash.sh
index 73bca66a..b1d453a8 100755
--- a/tests/bugs/data-crash.sh
+++ b/tests/bugs/data-crash.sh
@@ -55,7 +55,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$here/../src/pspp $TEMPDIR/ct.stat > /dev/null
+$SUPERVISOR $here/../src/pspp $TEMPDIR/ct.stat > /dev/null
 if [ $? -ne 1 ] ; then fail ; fi
 
 
diff --git a/tests/bugs/double-frequency.sh b/tests/bugs/double-frequency.sh
index 7509efa0..e52b7185 100755
--- a/tests/bugs/double-frequency.sh
+++ b/tests/bugs/double-frequency.sh
@@ -66,7 +66,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 cd $TEMPDIR
 
 activity="run data"
-$here/../src/pspp  $TEMPDIR/ff.stat
+$SUPERVISOR $here/../src/pspp  $TEMPDIR/ff.stat
 if [ $? -ne 0 ] ; then fail ; fi
 
 
diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh
index 1c082356..474735fc 100755
--- a/tests/bugs/html-frequency.sh
+++ b/tests/bugs/html-frequency.sh
@@ -66,7 +66,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 cd $TEMPDIR
 
 activity="run data"
-$here/../src/pspp -o html $TEMPDIR/ff.stat
+$SUPERVISOR $here/../src/pspp -o html $TEMPDIR/ff.stat
 if [ $? -ne 0 ] ; then fail ; fi
 
 
diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh
index cb7fb06a..72da71fc 100755
--- a/tests/bugs/random.sh
+++ b/tests/bugs/random.sh
@@ -63,7 +63,7 @@ list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-$here/../src/pspp -o raw-ascii $TEMPDIR/rnd.sps
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/rnd.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index 90c1351f..916587dc 100755
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -69,7 +69,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp    -o raw-ascii $TEMPDIR/test.sps  
+$SUPERVISOR $here/../src/pspp    -o raw-ascii $TEMPDIR/test.sps  
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="test result"
diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 2ef03f9f..01c90904 100755
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -73,7 +73,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp    -o raw-ascii $TEMPDIR/prog.sps  
+$SUPERVISOR $here/../src/pspp    -o raw-ascii $TEMPDIR/prog.sps  
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="test output"
diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh
index cdbf0a6b..382e2a03 100755
--- a/tests/command/beg-data.sh
+++ b/tests/command/beg-data.sh
@@ -84,7 +84,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare data"
diff --git a/tests/command/bignum.sh b/tests/command/bignum.sh
index 17cc5519..1ccc09ba 100755
--- a/tests/command/bignum.sh
+++ b/tests/command/bignum.sh
@@ -147,7 +147,7 @@ foobar
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp -o raw-ascii prog.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii prog.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # Like the above comments say ...
diff --git a/tests/command/compute.sh b/tests/command/compute.sh
index 8d2480d9..7aa0dbb9 100755
--- a/tests/command/compute.sh
+++ b/tests/command/compute.sh
@@ -71,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/compute.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/compute.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 diff -B -b $TEMPDIR/pspp.list - <<EOF
diff --git a/tests/command/count.sh b/tests/command/count.sh
index 345e2527..7e9d7818 100755
--- a/tests/command/count.sh
+++ b/tests/command/count.sh
@@ -65,7 +65,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$here/../src/pspp -o raw-ascii $TEMPDIR/count.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/count.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
diff --git a/tests/command/descriptives.sh b/tests/command/descriptives.sh
index 20dfeeac..eaa39fcc 100755
--- a/tests/command/descriptives.sh
+++ b/tests/command/descriptives.sh
@@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/descript.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/descript.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index d5f69102..ba65d474 100755
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -70,7 +70,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
 
 # This command must fail
 activity="run prog 1"
-$here/../src/pspp $TEMPDIR/foo.sps > /dev/null
+$SUPERVISOR $here/../src/pspp $TEMPDIR/foo.sps > /dev/null
 if [ $? -eq 0 ] ; then fail ; fi
 
 
@@ -84,7 +84,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog 1"
-$here/../src/pspp $TEMPDIR/foo.sps
+$SUPERVISOR $here/../src/pspp $TEMPDIR/foo.sps
 if [ $? -ne 0 ] ; then fail ; fi
 
 # foobar should now be gone
diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index f69e79d2..931d0c11 100755
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -104,7 +104,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/file-lab.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/file-lab.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # We need to filter out the dates/times
diff --git a/tests/command/filter.sh b/tests/command/filter.sh
index 180b59f6..1214c728 100755
--- a/tests/command/filter.sh
+++ b/tests/command/filter.sh
@@ -75,7 +75,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/filter.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/filter.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
diff --git a/tests/command/flip.sh b/tests/command/flip.sh
index 759c4fd0..269939fd 100755
--- a/tests/command/flip.sh
+++ b/tests/command/flip.sh
@@ -65,7 +65,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/flip.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/flip.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
diff --git a/tests/command/lag.sh b/tests/command/lag.sh
index db7c2969..77ec38e8 100755
--- a/tests/command/lag.sh
+++ b/tests/command/lag.sh
@@ -64,7 +64,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/lag.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/lag.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare result"
diff --git a/tests/command/list.sh b/tests/command/list.sh
index 4dc92dd5..c82dd273 100755
--- a/tests/command/list.sh
+++ b/tests/command/list.sh
@@ -75,7 +75,7 @@ foobar
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/list.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/list.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
diff --git a/tests/command/loop.sh b/tests/command/loop.sh
index 474c8994..15f43ec7 100755
--- a/tests/command/loop.sh
+++ b/tests/command/loop.sh
@@ -63,7 +63,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/loop.stat > $TEMPDIR/stdout
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/loop.stat > $TEMPDIR/stdout
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare stdout"
diff --git a/tests/command/percentiles.sh b/tests/command/percentiles.sh
index aa7d81a8..83cace7e 100755
--- a/tests/command/percentiles.sh
+++ b/tests/command/percentiles.sh
@@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog"
-$here/../src/pspp -o raw-ascii $TEMPDIR/percents.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/percents.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
diff --git a/tests/command/print.sh b/tests/command/print.sh
index 6451bdbc..fdfcf9cb 100755
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -86,7 +86,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs
+$SUPERVISOR $here/../src/pspp -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs
 # Note   vv   --- there are errors in input.  Therefore, the  command must FAIL
 if [ $? -eq 0 ] ; then fail ; fi
 
diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index 6d3317e4..56a1bb30 100755
--- a/tests/command/sample.sh
+++ b/tests/command/sample.sh
@@ -70,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp -o raw-ascii --testing-mode $TEMPDIR/sample.stat 
+$SUPERVISOR $here/../src/pspp -o raw-ascii --testing-mode $TEMPDIR/sample.stat 
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create head"
diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index 0f7dd177..c53c1972 100755
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -58,7 +58,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/sort.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/sort.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # Now there should be some sorted data in $TEMPDIR/pspp.list
diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh
index 666f39dd..6b9a5ea3 100755
--- a/tests/command/split-file.sh
+++ b/tests/command/split-file.sh
@@ -71,7 +71,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/split.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/split.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
diff --git a/tests/command/sys-info.sh b/tests/command/sys-info.sh
index 96420ae0..31025a0c 100755
--- a/tests/command/sys-info.sh
+++ b/tests/command/sys-info.sh
@@ -61,7 +61,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 1"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/save.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/save.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
@@ -73,7 +73,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 2"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/read.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/read.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
diff --git a/tests/command/tabs.sh b/tests/command/tabs.sh
index 0a2915f3..9d57c008 100755
--- a/tests/command/tabs.sh
+++ b/tests/command/tabs.sh
@@ -67,7 +67,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp -o raw-ascii $TEMPDIR/tabs.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/tabs.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index 3b71997f..826a9a1c 100755
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -58,7 +58,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/weight.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/weight.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"