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 0545202ee991944ea95c451d341d741733a1a6f1..f92371b1a58fef0ea415245c6a3613e29f5f94ca 100644 (file)
--- 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 f292563b6bec12f8aa899d74758eb68fdc690e2b..102f98bae090ffa89cb38c4df4b35e558015a7ba 100755 (executable)
--- 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 4bd6e47e0014e55695f5b01c283b2365958b0760..a850750d7f128beececf68b5fec1ccd41d507b4f 100755 (executable)
--- 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 73bca66ad40b50fe0546f390f864150cee9fdcd5..b1d453a8bce178977e4c2033b883f200bc8aafcf 100755 (executable)
--- 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 7509efa0f309fb49ea4d9d63202608e136a12ad5..e52b7185f6de352250b80075e461e96965cfd5b8 100755 (executable)
--- 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 1c082356f8355089221326b285fd36388262c33c..474735fc74ba0bec85bfcdefcfdb36ffd187ef89 100755 (executable)
--- 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 cb7fb06a31780b186a1d610f944ab4896a689f79..72da71fcd5436841d553c05a76fb6c331126ac93 100755 (executable)
--- 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 90c1351f090763fcfd7d9030d781328e4ef7cfc3..916587dc0c575c5fca125d7706be6f00569db5b9 100755 (executable)
--- 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 2ef03f9f25c48487268adb59335de5353cd4e762..01c90904a230f6750b1c0b76f0a19db7aabd5bcd 100755 (executable)
--- 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 cdbf0a6b0e24cbc5defc8cb2ae923b413bbbb7bb..382e2a036594c327b3700e3892805927872c3395 100755 (executable)
--- 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 17cc55197a96b380bff4172f5958d91bd28ba887..1ccc09ba4fa59ca1a0a5b02a92041d20653fd7b9 100755 (executable)
--- 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 8d2480d9d9d54ee86646d6148b309cd5fcc042f5..7aa0dbb909850c8fe13d9e392d9b1f58968063b5 100755 (executable)
--- 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 345e2527733f5b32d3fc34a7c2f31bd82cda0e00..7e9d7818773a34f7114eadfee95e329149c3e213 100755 (executable)
--- 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 20dfeeac7dd3d60c29daf922596a3fdbc6deec62..eaa39fcc9b44ac5ecb1aa4e15686e09cea9a6c5a 100755 (executable)
--- 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 d5f69102336df73925e1db958f89ba801221c9e8..ba65d474e6abe925dce0b278925f9f17f4fb26b8 100755 (executable)
--- 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 f69e79d28a8f6ebd021573ccfa7a90d151e83411..931d0c11af14420816fc21c183868760300717a9 100755 (executable)
--- 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 180b59f68a99f5a59ba046c05344cb559b72248b..1214c72894a722a98e541a568494928744677399 100755 (executable)
--- 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 759c4fd07f3f749912a813c071c9f2574c1a6301..269939fd01907c0c344ca3446936eaffde93ef3e 100755 (executable)
--- 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 db7c2969325a9f2db934d02dfa921d903b0350c6..77ec38e8538bb452b5c5e44f4c9c7e87ae50e210 100755 (executable)
--- 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 4dc92dd55c686778b9a9460e21b09f7d5e39e235..c82dd27346c8b951b405bb69cac191ecdb67f0b4 100755 (executable)
--- 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 474c89947f5fcdfa75e7bb26fb79c094563ef10d..15f43ec738d7914a71f7a22dfc815b73814ff455 100755 (executable)
--- 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 aa7d81a8031f5168fe4022326de1402929fd3d5e..83cace7e254fcc28eee29ffc90f114dc7c357d95 100755 (executable)
--- 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 6451bdbcaf3c545a8d0d00a47a1b90bb2e2daf74..fdfcf9cb5d798f929fa631f742df21bf0393833f 100755 (executable)
--- 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 6d3317e43a70af5a73228a60a4145581924f9d26..56a1bb30c425cba16c7e0d15d70ba5abc00ead56 100755 (executable)
--- 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 0f7dd17783f27f486f3359aceb1b0b6cd202e9b1..c53c19720583637e6cce2353a13dc95a10057227 100755 (executable)
--- 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 666f39dd3ba58f136812adb20d7bd08d398b1b4d..6b9a5ea38979991399875bbcd9ff254f976dda86 100755 (executable)
--- 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 96420ae055b20f00da8b7e9fa3b5a94fcc47231d..31025a0cfe7d02fa811c2fcedfa761e80f974466 100755 (executable)
--- 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 0a2915f3e8e362453b110e948b3d14e69c6b9375..9d57c0082e94ec2b6cafd94edf01ea045fcef69f 100755 (executable)
--- 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 3b71997f03d54cc25f400d563e93ae5b9597232e..826a9a1cc089fb70d75185b45c1be2646fc08f10 100755 (executable)
--- 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"