From 65a4e29574b67921ea899b6a1d45806dca11db00 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 11 Mar 2006 07:16:39 +0000 Subject: [PATCH] Changed the default value od SCOMPRESS to true. Moved the pspp binary to src/ui/terminal and updated tests accordingly. --- src/ChangeLog | 7 +++ src/automake.mk | 48 +++++-------------- src/data/ChangeLog | 4 ++ src/data/settings.c | 2 +- src/output/charts/automake.mk | 3 -- src/ui/terminal/ChangeLog | 4 ++ src/ui/terminal/automake.mk | 31 ++++++++++++ tests/ChangeLog | 3 ++ tests/bugs/agg-crash-2.sh | 3 +- tests/bugs/agg_crash.sh | 3 +- tests/bugs/alpha-freq.sh | 3 +- tests/bugs/big-input-2.sh | 5 +- tests/bugs/big-input.sh | 3 +- tests/bugs/comment-at-eof.sh | 3 +- tests/bugs/compression.sh | 3 +- tests/bugs/compute-fmt.sh | 3 +- tests/bugs/compute-lv.sh | 3 +- tests/bugs/computebug.sh | 3 +- tests/bugs/crosstabs-crash.sh | 3 +- tests/bugs/crosstabs.sh | 3 +- tests/bugs/curtailed.sh | 3 +- tests/bugs/data-crash.sh | 3 +- tests/bugs/double-frequency.sh | 3 +- tests/bugs/examine-1sample.sh | 3 +- tests/bugs/examine-missing.sh | 3 +- tests/bugs/get-no-file.sh | 3 +- tests/bugs/get.sh | 3 +- tests/bugs/html-frequency.sh | 3 +- tests/bugs/if_crash.sh | 3 +- tests/bugs/input-crash.sh | 3 +- tests/bugs/lag_crash.sh | 3 +- tests/bugs/match-files-scratch.sh | 3 +- tests/bugs/multipass.sh | 3 +- tests/bugs/random.sh | 3 +- tests/bugs/recode-copy-bug.sh | 5 +- tests/bugs/t-test-alpha.sh | 3 +- tests/bugs/t-test-alpha2.sh | 3 +- tests/bugs/t-test-with-temp.sh | 3 +- tests/bugs/t-test.sh | 3 +- tests/bugs/temp-freq.sh | 3 +- tests/bugs/temporary.sh | 3 +- tests/bugs/val-labs-trailing-slash.sh | 3 +- tests/bugs/val-labs.sh | 3 +- tests/command/aggregate.sh | 3 +- tests/command/autorecod.sh | 3 +- tests/command/beg-data.sh | 3 +- tests/command/bignum.sh | 3 +- tests/command/count.sh | 3 +- tests/command/data-list.sh | 3 +- tests/command/do-repeat.sh | 3 +- tests/command/erase.sh | 5 +- tests/command/examine-extremes.sh | 3 +- tests/command/examine-percentiles.sh | 3 +- tests/command/examine.sh | 3 +- tests/command/file-handle.sh | 3 +- tests/command/file-label.sh | 3 +- tests/command/filter.sh | 3 +- tests/command/flip.sh | 3 +- tests/command/import-export.sh | 3 +- tests/command/lag.sh | 3 +- tests/command/list.sh | 3 +- tests/command/longvars.sh | 3 +- tests/command/loop.sh | 3 +- tests/command/match-files.sh | 7 +-- tests/command/missing-values.sh | 3 +- tests/command/no_case_size.sh | 3 +- tests/command/oneway-missing.sh | 7 +-- tests/command/oneway-with-splits.sh | 3 +- tests/command/oneway.sh | 3 +- tests/command/permissions.sh | 5 +- tests/command/print.sh | 3 +- tests/command/rename.sh | 5 +- tests/command/sample.sh | 3 +- tests/command/sort.sh | 3 +- tests/command/split-file.sh | 3 +- tests/command/sysfile-info.sh | 5 +- tests/command/sysfiles-old.sh | 3 +- tests/command/sysfiles.sh | 3 +- tests/command/t-test-1-indep-val.sh | 3 +- tests/command/t-test-1-sample-missing-anal.sh | 5 +- tests/command/t-test-1-sample-missing-list.sh | 5 +- tests/command/t-test-1s.sh | 3 +- tests/command/t-test-groups.sh | 3 +- tests/command/t-test-indep-missing-anal.sh | 5 +- tests/command/t-test-indep-missing-list.sh | 5 +- tests/command/t-test-paired-missing-anal.sh | 5 +- tests/command/t-test-paired-missing-list.sh | 5 +- tests/command/t-test-pairs.sh | 3 +- tests/command/tabs.sh | 3 +- tests/command/trimmed-mean.sh | 3 +- tests/command/use.sh | 3 +- tests/command/weight.sh | 3 +- tests/expressions/epoch.sh | 3 +- tests/expressions/expressions.sh | 9 ++-- tests/expressions/randist.sh | 3 +- tests/expressions/variables.sh | 3 +- tests/expressions/vectors.sh | 3 +- tests/stats/descript-basic.sh | 3 +- tests/stats/descript-mean-bug.sh | 3 +- tests/stats/descript-missing.sh | 3 +- tests/stats/moments.sh | 5 +- tests/stats/ntiles.sh | 5 +- tests/stats/percentiles-compatible.sh | 3 +- tests/stats/percentiles-enhanced.sh | 9 ++-- tests/test_template | 4 +- tests/xforms/casefile.sh | 3 +- 106 files changed, 283 insertions(+), 162 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 888271fa..30fab6ad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +Sat Mar 11 14:17:47 WST 2006 John Darrington + + * automake.mk: Changed the pattern specific AM_CPPFLAGS to two target + specific ones. Eventually there will be none at all. + + * automake.mk: Moved the pspp binary to ui/terminal + Sat Mar 4 12:59:08 2006 Ben Pfaff * In many source files, #include "compiler.h" to get GCC attribute diff --git a/src/automake.mk b/src/automake.mk index f709b8de..27946483 100644 --- a/src/automake.mk +++ b/src/automake.mk @@ -14,44 +14,18 @@ include $(top_srcdir)/src/ui/gui/automake.mk endif -src/%: AM_CPPFLAGS += \ - -I$(top_srcdir)/src/math \ +src/message.o: AM_CPPFLAGS += \ + -I$(top_srcdir)/src/language \ + -I$(top_srcdir)/src/language/lexer \ -I$(top_srcdir)/src/ui/terminal \ - -I$(top_srcdir)/src/libpspp \ -I$(top_srcdir)/src/data \ - -I$(top_srcdir)/src/output \ + -I$(top_srcdir)/src/libpspp + +src/procedure.o: AM_CPPFLAGS += \ -I$(top_srcdir)/src/language \ - -I$(top_srcdir)/src/language/lexer \ - -I$(top_srcdir)/src/language/control - - -bin_PROGRAMS += src/pspp - -src_pspp_SOURCES = \ - src/message.c \ - src/procedure.c src/procedure.h - -src_pspp_LDADD = \ - $(top_builddir)/src/language/expressions/libexpressions.a \ - $(top_builddir)/src/language/liblanguage.a \ - $(top_builddir)/src/language/tests/libtests.a \ - $(top_builddir)/src/language/utilities/libutilities.a \ - $(top_builddir)/src/language/control/libcontrol.a \ - $(top_builddir)/src/language/stats/libstats.a \ - $(top_builddir)/src/language/xforms/libxforms.a \ - $(top_builddir)/src/language/dictionary/libcmddict.a \ - $(top_builddir)/src/language/lexer/liblexer.a \ - $(top_builddir)/src/language/data-io/libdata_io.a \ - $(top_builddir)/src/output/charts/libcharts.a \ - $(top_builddir)/src/output/liboutput.a \ - $(top_builddir)/src/math/libpspp_math.a \ - $(top_builddir)/src/math/linreg/libpspp_linreg.a \ - $(top_builddir)/src/ui/terminal/libui.a \ - $(top_builddir)/lib/linreg/liblinreg.a \ - $(top_builddir)/lib/gsl-extras/libgsl-extras.a \ - $(top_builddir)/src/data/libdata.a \ - $(top_builddir)/src/libpspp/libpspp.a \ - $(top_builddir)/gl/libgl.a \ - @LIBINTL@ @LIBREADLINE@ - + -I$(top_srcdir)/src/language/control \ + -I$(top_srcdir)/src/output \ + -I$(top_srcdir)/src/data \ + -I$(top_srcdir)/src/libpspp + diff --git a/src/data/ChangeLog b/src/data/ChangeLog index 58941a86..e0a4f196 100644 --- a/src/data/ChangeLog +++ b/src/data/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 11 15:06:07 WST 2006 John Darrington + + * settings.c: Changed default value of scompress to true. + Sat Mar 4 13:22:51 2006 Ben Pfaff * sfm-private.h: Include variable.h, to get SHORT_NAME_LEN. diff --git a/src/data/settings.c b/src/data/settings.c index 81b67899..64f037ed 100644 --- a/src/data/settings.c +++ b/src/data/settings.c @@ -42,7 +42,7 @@ static int epoch = -1; static bool errorbreak = false; -static bool scompress = false; +static bool scompress = true; static bool undefined = true; static double blanks = SYSMIS; diff --git a/src/output/charts/automake.mk b/src/output/charts/automake.mk index af24ef49..6db4bf28 100644 --- a/src/output/charts/automake.mk +++ b/src/output/charts/automake.mk @@ -1,10 +1,7 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- - - noinst_LIBRARIES += src/output/charts/libcharts.a - src/output/charts/%: AM_CPPFLAGS += \ -I$(top_srcdir)/src/libpspp \ -I$(top_srcdir)/src/output \ diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog index 4a96aeb9..be87f7f9 100644 --- a/src/ui/terminal/ChangeLog +++ b/src/ui/terminal/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 11 14:18:39 WST 2006 John Darrington + + * automake.mk: Moved the pspp binary here. + Thu Mar 2 08:40:33 WST 2006 John Darrington * Moved files from src directory diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk index 18233dd3..d68f5c18 100644 --- a/src/ui/terminal/automake.mk +++ b/src/ui/terminal/automake.mk @@ -15,3 +15,34 @@ src_ui_terminal_libui_a_SOURCES = \ src/ui/terminal/command-line.c src/ui/terminal/command-line.h \ src/ui/terminal/read-line.c src/ui/terminal/read-line.h \ src/ui/terminal/main.c + + +bin_PROGRAMS += src/ui/terminal/pspp + +src_ui_terminal_pspp_SOURCES = \ + src/message.c \ + src/procedure.c src/procedure.h + +src_ui_terminal_pspp_LDADD = \ + $(top_builddir)/src/language/expressions/libexpressions.a \ + $(top_builddir)/src/language/liblanguage.a \ + $(top_builddir)/src/language/tests/libtests.a \ + $(top_builddir)/src/language/utilities/libutilities.a \ + $(top_builddir)/src/language/control/libcontrol.a \ + $(top_builddir)/src/language/stats/libstats.a \ + $(top_builddir)/src/language/xforms/libxforms.a \ + $(top_builddir)/src/language/dictionary/libcmddict.a \ + $(top_builddir)/src/language/lexer/liblexer.a \ + $(top_builddir)/src/language/data-io/libdata_io.a \ + $(top_builddir)/src/output/charts/libcharts.a \ + $(top_builddir)/src/output/liboutput.a \ + $(top_builddir)/src/math/libpspp_math.a \ + $(top_builddir)/src/math/linreg/libpspp_linreg.a \ + $(top_builddir)/src/ui/terminal/libui.a \ + $(top_builddir)/lib/linreg/liblinreg.a \ + $(top_builddir)/lib/gsl-extras/libgsl-extras.a \ + $(top_builddir)/src/data/libdata.a \ + $(top_builddir)/src/libpspp/libpspp.a \ + $(top_builddir)/gl/libgl.a \ + @LIBINTL@ @LIBREADLINE@ + diff --git a/tests/ChangeLog b/tests/ChangeLog index 9866d7c7..c4b5fda1 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,6 @@ +Sat Mar 11 14:16:01 WST 2006 John Darrington + + * Updated the tests to use the new location of the pspp binary. * Made all the tests work as stand-alone scripts. Sun Feb 12 19:07:24 2006 Ben Pfaff diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh index e3de759c..70db8cf6 100755 --- a/tests/bugs/agg-crash-2.sh +++ b/tests/bugs/agg-crash-2.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ LIST /x y. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff --git a/tests/bugs/agg_crash.sh b/tests/bugs/agg_crash.sh index 7e8adba2..ec202db7 100755 --- a/tests/bugs/agg_crash.sh +++ b/tests/bugs/agg_crash.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -71,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # So this will have a non zero error status. # But it shouldn't crash! activity="run_program" -$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null +$SUPERVISOR $PSPP $TESTFILE > /dev/null if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/alpha-freq.sh b/tests/bugs/alpha-freq.sh index 4f122b34..d964057b 100755 --- a/tests/bugs/alpha-freq.sh +++ b/tests/bugs/alpha-freq.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -66,7 +67,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp $TEMPDIR/prog.sps +$SUPERVISOR $PSPP $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/big-input-2.sh b/tests/bugs/big-input-2.sh index d2fa2a61..1fe9b60e 100755 --- a/tests/bugs/big-input-2.sh +++ b/tests/bugs/big-input-2.sh @@ -12,6 +12,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -78,7 +79,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null if [ $? -ne 0 ] ; then fail ; fi activity="appending to data" @@ -87,7 +88,7 @@ $PERL -e 'for ($i=0; $i<25000; $i++) { print "AB04\nAB12\n" };' >> $TEMPDIR/larg if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/big-input.sh b/tests/bugs/big-input.sh index 104cca5d..bcafa788 100755 --- a/tests/bugs/big-input.sh +++ b/tests/bugs/big-input.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/foo.sps > /dev/null +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps > /dev/null if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/comment-at-eof.sh b/tests/bugs/comment-at-eof.sh index f15d0095..617659b3 100755 --- a/tests/bugs/comment-at-eof.sh +++ b/tests/bugs/comment-at-eof.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -58,7 +59,7 @@ COMMENT this is a comment at end of file. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/foo.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps if [ $? -ne 0 ] ; then fail; fi pass; diff --git a/tests/bugs/compression.sh b/tests/bugs/compression.sh index e705480c..5b7178d2 100755 --- a/tests/bugs/compression.sh +++ b/tests/bugs/compression.sh @@ -10,6 +10,7 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi if [ -z "$top_builddir" ] ; then top_builddir=. ; fi top_srcdir=`cd $top_srcdir; pwd` top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp export STAT_CONFIG_PATH=$top_srcdir/config @@ -71,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then fail ; fi # Make sure the file really was compressed diff --git a/tests/bugs/compute-fmt.sh b/tests/bugs/compute-fmt.sh index d4c0c223..ea860281 100755 --- a/tests/bugs/compute-fmt.sh +++ b/tests/bugs/compute-fmt.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -65,7 +66,7 @@ SAVE outfile='$TEMPDIR/temp.sav'. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/foo.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps if [ $? -ne 0 ] ; then fail; fi diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh index 6b7b70b1..784fe046 100755 --- a/tests/bugs/compute-lv.sh +++ b/tests/bugs/compute-lv.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run prog" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/computebug.sh b/tests/bugs/computebug.sh index 307244e3..cf9e4565 100755 --- a/tests/bugs/computebug.sh +++ b/tests/bugs/computebug.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -59,7 +60,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/computebug.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/computebug.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh index 84bd9d6d..6602f690 100755 --- a/tests/bugs/crosstabs-crash.sh +++ b/tests/bugs/crosstabs-crash.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -63,7 +64,7 @@ CROSSTABS VARIABLES X (1,7) Y (1,7) /TABLES X BY Y. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh index 41e2cf01..b4eb3dbe 100755 --- a/tests/bugs/crosstabs.sh +++ b/tests/bugs/crosstabs.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -79,7 +80,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp $TEMPDIR/ct.stat +$SUPERVISOR $PSPP $TEMPDIR/ct.stat if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh index c0f59294..93c45b59 100755 --- a/tests/bugs/curtailed.sh +++ b/tests/bugs/curtailed.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #This must fail activity="run program" -$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null +$SUPERVISOR $PSPP $TESTFILE > /dev/null if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/data-crash.sh b/tests/bugs/data-crash.sh index 3ebde4fb..31555523 100755 --- a/tests/bugs/data-crash.sh +++ b/tests/bugs/data-crash.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -62,7 +63,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #This must fail activity="run program" -$SUPERVISOR $top_builddir/src/pspp $TEMPDIR/ct.stat > /dev/null +$SUPERVISOR $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 9c0e7ba5..b6e6a50f 100755 --- a/tests/bugs/double-frequency.sh +++ b/tests/bugs/double-frequency.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -72,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi cd $TEMPDIR activity="run data" -$SUPERVISOR $top_builddir/src/pspp $TEMPDIR/ff.stat +$SUPERVISOR $PSPP $TEMPDIR/ff.stat if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/examine-1sample.sh b/tests/bugs/examine-1sample.sh index f775ae95..00a6ce29 100755 --- a/tests/bugs/examine-1sample.sh +++ b/tests/bugs/examine-1sample.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -68,7 +69,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then fail ; fi pass diff --git a/tests/bugs/examine-missing.sh b/tests/bugs/examine-missing.sh index bbb20273..711d9685 100755 --- a/tests/bugs/examine-missing.sh +++ b/tests/bugs/examine-missing.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null if [ $? -ne 0 ] ; then fail ; fi pass; diff --git a/tests/bugs/get-no-file.sh b/tests/bugs/get-no-file.sh index 7a72c964..56bb153a 100755 --- a/tests/bugs/get-no-file.sh +++ b/tests/bugs/get-no-file.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -63,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # We use the stdinput here, because the bug seems to manifest itself only in # interactive mode. activity="run program" -cat $TESTFILE | $SUPERVISOR $top_builddir/src/pspp -o raw-ascii > /dev/null +cat $TESTFILE | $SUPERVISOR $PSPP -o raw-ascii > /dev/null if [ $? -ne 0 ] ; then fail ; fi pass diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh index 550ef1a7..024da3f1 100755 --- a/tests/bugs/get.sh +++ b/tests/bugs/get.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -82,7 +83,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh index e589c517..8fda1439 100755 --- a/tests/bugs/html-frequency.sh +++ b/tests/bugs/html-frequency.sh @@ -12,6 +12,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute cd $top_srcdir ; top_srcdir=`pwd` @@ -72,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi cd $TEMPDIR activity="run data" -$SUPERVISOR $top_builddir/src/pspp -o html $TESTFILE +$SUPERVISOR $PSPP -o html $TESTFILE if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/if_crash.sh b/tests/bugs/if_crash.sh index de01dab4..4e414eb1 100755 --- a/tests/bugs/if_crash.sh +++ b/tests/bugs/if_crash.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -75,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # So this will have a non zero error status. # But it shouldn't crash! activity="run_program" -$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null +$SUPERVISOR $PSPP $TESTFILE > /dev/null if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/input-crash.sh b/tests/bugs/input-crash.sh index fbe4ba4d..03dd961c 100755 --- a/tests/bugs/input-crash.sh +++ b/tests/bugs/input-crash.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -72,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi # The above syntax is invalid, so this program should fail to parse activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE > /dev/null if [ $? -ne 1 ] ; then fail ; fi diff --git a/tests/bugs/lag_crash.sh b/tests/bugs/lag_crash.sh index 527ac66a..0ed8e077 100755 --- a/tests/bugs/lag_crash.sh +++ b/tests/bugs/lag_crash.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run_program" -$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null +$SUPERVISOR $PSPP $TESTFILE > /dev/null if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh index 9303f4f5..e526cd51 100755 --- a/tests/bugs/match-files-scratch.sh +++ b/tests/bugs/match-files-scratch.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.pspp if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -73,7 +74,7 @@ FINISH. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh index 4933b469..3e0b1339 100755 --- a/tests/bugs/multipass.sh +++ b/tests/bugs/multipass.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -73,7 +74,7 @@ DESCRIPTIVES EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh index 92264d4f..869928d6 100755 --- a/tests/bugs/random.sh +++ b/tests/bugs/random.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/recode-copy-bug.sh b/tests/bugs/recode-copy-bug.sh index d9e34438..7f838d61 100755 --- a/tests/bugs/recode-copy-bug.sh +++ b/tests/bugs/recode-copy-bug.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -63,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/recode-copy-bug-1.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/recode-copy-bug-1.stat if [ $? -ne 0 ] ; then no_result ; fi @@ -74,7 +75,7 @@ if [ $? -ne 0 ] ; then fail ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/recode-copy-bug-2.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/recode-copy-bug-2.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh index 2f2e953c..8cffe34c 100755 --- a/tests/bugs/t-test-alpha.sh +++ b/tests/bugs/t-test-alpha.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -77,7 +78,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/bugs/t-test-alpha2.sh b/tests/bugs/t-test-alpha2.sh index b8ab8f83..9568707f 100755 --- a/tests/bugs/t-test-alpha2.sh +++ b/tests/bugs/t-test-alpha2.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -76,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null #invert v if [ $? -eq 0 ] ; then fail ; fi diff --git a/tests/bugs/t-test-with-temp.sh b/tests/bugs/t-test-with-temp.sh index 033cac2c..e4bc0af4 100755 --- a/tests/bugs/t-test-with-temp.sh +++ b/tests/bugs/t-test-with-temp.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" diff --git a/tests/bugs/t-test.sh b/tests/bugs/t-test.sh index 76c53258..d2c92ecc 100755 --- a/tests/bugs/t-test.sh +++ b/tests/bugs/t-test.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -72,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #The syntax was invalid. Therefore pspp must return non zero. activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null if [ $? -ne 1 ] ; then fail ; fi pass; diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh index 40b1c09d..2e884f6b 100755 --- a/tests/bugs/temp-freq.sh +++ b/tests/bugs/temp-freq.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -75,7 +76,7 @@ FINISH EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh index 5d41d4a7..5aed6fde 100755 --- a/tests/bugs/temporary.sh +++ b/tests/bugs/temporary.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -75,7 +76,7 @@ list. EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/bugs/val-labs-trailing-slash.sh b/tests/bugs/val-labs-trailing-slash.sh index fc265b5f..30c875ff 100755 --- a/tests/bugs/val-labs-trailing-slash.sh +++ b/tests/bugs/val-labs-trailing-slash.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -72,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then fail ; fi pass diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh index 0858c9c1..0e7d3a47 100755 --- a/tests/bugs/val-labs.sh +++ b/tests/bugs/val-labs.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -72,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #Invalid syntax --- return value is non zero. activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null if [ $? -ne 1 ] ; then fail ; fi pass; diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh index 36a9feff..b85edba3 100755 --- a/tests/command/aggregate.sh +++ b/tests/command/aggregate.sh @@ -11,6 +11,7 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi if [ -z "$top_builddir" ] ; then top_builddir=. ; fi top_srcdir=`cd $top_srcdir; pwd` top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp STAT_CONFIG_PATH=$top_srcdir/config @@ -205,7 +206,7 @@ for outfile in scratch active external; do if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" - $SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1 + $SUPERVISOR $PSPP --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1 if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh index d7e928c6..b33fe15c 100755 --- a/tests/command/autorecod.sh +++ b/tests/command/autorecod.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -80,7 +81,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE 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 5def42a3..5b9e9384 100755 --- a/tests/command/beg-data.sh +++ b/tests/command/beg-data.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -79,7 +80,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare data" diff --git a/tests/command/bignum.sh b/tests/command/bignum.sh index 53137e27..fa6e31a4 100755 --- a/tests/command/bignum.sh +++ b/tests/command/bignum.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -133,7 +134,7 @@ foobar if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi # Like the above comments say ... diff --git a/tests/command/count.sh b/tests/command/count.sh index 05ee4430..6a34eba0 100755 --- a/tests/command/count.sh +++ b/tests/command/count.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -71,7 +72,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh index 9f073013..fc42b94c 100755 --- a/tests/command/data-list.sh +++ b/tests/command/data-list.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -105,7 +106,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii --testing-mode $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode $TESTFILE if [ $? -ne 0 ] ; then fail ; fi activity="compare output" diff --git a/tests/command/do-repeat.sh b/tests/command/do-repeat.sh index 4ec9ff77..452814fa 100755 --- a/tests/command/do-repeat.sh +++ b/tests/command/do-repeat.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -79,7 +80,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE >/dev/null 2>&1 +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE >/dev/null 2>&1 if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/command/erase.sh b/tests/command/erase.sh index 651c8cc6..8b06c42c 100755 --- a/tests/command/erase.sh +++ b/tests/command/erase.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -76,7 +77,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi # This command must fail activity="run prog 1" -$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null +$SUPERVISOR $PSPP $TESTFILE > /dev/null if [ $? -eq 0 ] ; then fail ; fi @@ -90,7 +91,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run prog 1" -$SUPERVISOR $top_builddir/src/pspp $TESTFILE +$SUPERVISOR $PSPP $TESTFILE if [ $? -ne 0 ] ; then fail ; fi # foobar should now be gone diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh index 9c2dfb60..5a0a630d 100755 --- a/tests/command/examine-extremes.sh +++ b/tests/command/examine-extremes.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -88,7 +89,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh index ea918c80..3759710b 100755 --- a/tests/command/examine-percentiles.sh +++ b/tests/command/examine-percentiles.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -80,7 +81,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/examine.sh b/tests/command/examine.sh index 255c9c6e..95d91abf 100755 --- a/tests/command/examine.sh +++ b/tests/command/examine.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -91,7 +92,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi # NOTE: In the following data: Only the extreme values have been checked diff --git a/tests/command/file-handle.sh b/tests/command/file-handle.sh index fcf1907f..14596edb 100755 --- a/tests/command/file-handle.sh +++ b/tests/command/file-handle.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -71,7 +72,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh index 79dd1c25..ca9da9cd 100755 --- a/tests/command/file-label.sh +++ b/tests/command/file-label.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -109,7 +110,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE 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 34595062..cf685ba9 100755 --- a/tests/command/filter.sh +++ b/tests/command/filter.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -81,7 +82,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/flip.sh b/tests/command/flip.sh index 15794a19..c7429b32 100755 --- a/tests/command/flip.sh +++ b/tests/command/flip.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -71,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/flip.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/flip.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh index d5c33def..8b88937f 100755 --- a/tests/command/import-export.sh +++ b/tests/command/import-export.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/lag.sh b/tests/command/lag.sh index 679b6082..d5eadb0e 100755 --- a/tests/command/lag.sh +++ b/tests/command/lag.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/lag.stat +$SUPERVISOR $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 098d8464..dc8d1313 100755 --- a/tests/command/list.sh +++ b/tests/command/list.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -71,7 +72,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh index d448bffb..d2e24040 100755 --- a/tests/command/longvars.sh +++ b/tests/command/longvars.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/loop.sh b/tests/command/loop.sh index 56c536ac..03120299 100755 --- a/tests/command/loop.sh +++ b/tests/command/loop.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TEMPDIR/loop.stat > $TEMPDIR/stdout +$SUPERVISOR $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/match-files.sh b/tests/command/match-files.sh index 41da6f5c..65d0f457 100755 --- a/tests/command/match-files.sh +++ b/tests/command/match-files.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/match-files.pspp if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -164,7 +165,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" - $SUPERVISOR $top_builddir/src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1 + $SUPERVISOR $PSPP -o raw-ascii $name.pspp >/dev/null 2>&1 if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" @@ -189,7 +190,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1 +$SUPERVISOR $PSPP -o raw-ascii $name.pspp >/dev/null 2>&1 if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" @@ -238,7 +239,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run $name.pspp" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1 +$SUPERVISOR $PSPP -o raw-ascii $name.pspp >/dev/null 2>&1 if [ $? -ne 0 ] ; then no_result ; fi activity="check $name output" diff --git a/tests/command/missing-values.sh b/tests/command/missing-values.sh index 91670121..8e452312 100755 --- a/tests/command/missing-values.sh +++ b/tests/command/missing-values.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -108,7 +109,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii --testing-mode $TEMPDIR/missing-values.stat > $TEMPDIR/errs +$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode $TEMPDIR/missing-values.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/no_case_size.sh b/tests/command/no_case_size.sh index e2191834..25744bdc 100755 --- a/tests/command/no_case_size.sh +++ b/tests/command/no_case_size.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -67,7 +68,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/oneway-missing.sh b/tests/command/oneway-missing.sh index c4c0baea..989f8566 100755 --- a/tests/command/oneway-missing.sh +++ b/tests/command/oneway-missing.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -83,7 +84,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -121,7 +122,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" @@ -161,7 +162,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 3" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh index eadc55b1..33cacd12 100755 --- a/tests/command/oneway-with-splits.sh +++ b/tests/command/oneway-with-splits.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -95,7 +96,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh index 8ab91263..929963e2 100755 --- a/tests/command/oneway.sh +++ b/tests/command/oneway.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -92,7 +93,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list diff --git a/tests/command/permissions.sh b/tests/command/permissions.sh index 2bce2150..2c6005ad 100755 --- a/tests/command/permissions.sh +++ b/tests/command/permissions.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -65,7 +66,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/per.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/per.sps if [ $? -ne 0 ] ; then no_result ; fi activity="Check Permissions" @@ -81,7 +82,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/per.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/per.sps if [ $? -ne 0 ] ; then no_result ; fi activity="Check Permissions" diff --git a/tests/command/print.sh b/tests/command/print.sh index 5ef3faed..32a96d7f 100755 --- a/tests/command/print.sh +++ b/tests/command/print.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -76,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs +$SUPERVISOR $PSPP --testing-mode -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/rename.sh b/tests/command/rename.sh index 5b94c91f..6eae4a52 100755 --- a/tests/command/rename.sh +++ b/tests/command/rename.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -16,6 +17,8 @@ top_srcdir=`cd $top_srcdir; pwd` STAT_CONFIG_PATH=$top_srcdir/config export STAT_CONFIG_PATH +PSPP=$top_builddir/src/ui/terminal/pspp + cleanup() { @@ -73,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="check sysfile" diff --git a/tests/command/sample.sh b/tests/command/sample.sh index c90053ff..8a210d02 100755 --- a/tests/command/sample.sh +++ b/tests/command/sample.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -76,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii --testing-mode $TEMPDIR/sample.stat +$SUPERVISOR $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 3ad4e993..1eb4d855 100755 --- a/tests/command/sort.sh +++ b/tests/command/sort.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -115,7 +116,7 @@ for count_repeat_buffers in \ } > sort.pspp || no_result activity="run program" - $SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii sort.pspp + $SUPERVISOR $PSPP --testing-mode -o raw-ascii sort.pspp if [ $? -ne 0 ] ; then no_result ; fi perl -pi -e 's/^\s*$//g' sort.exp sort.out diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh index d1942b01..250b97ab 100755 --- a/tests/command/split-file.sh +++ b/tests/command/split-file.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -77,7 +78,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/split.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/split.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh index 17969c5e..03d71f74 100755 --- a/tests/command/sysfile-info.sh +++ b/tests/command/sysfile-info.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -71,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="filter output" @@ -95,7 +96,7 @@ Variables: 2 Cases: 3 Type: System File. Weight: Not weighted. -Mode: Compression off. +Mode: Compression on. +--------+-------------+---+ |Variable|Description |Pos| | | |iti| diff --git a/tests/command/sysfiles-old.sh b/tests/command/sysfiles-old.sh index a49aff50..d1991724 100755 --- a/tests/command/sysfiles-old.sh +++ b/tests/command/sysfiles-old.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -79,7 +80,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="check file exists" diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh index 780710dc..7e0dcafc 100755 --- a/tests/command/sysfiles.sh +++ b/tests/command/sysfiles.sh @@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -78,7 +79,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh index 8aa4d817..fb9901cb 100755 --- a/tests/command/t-test-1-indep-val.sh +++ b/tests/command/t-test-1-indep-val.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -85,7 +86,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-1-sample-missing-anal.sh b/tests/command/t-test-1-sample-missing-anal.sh index 7491e43d..dcbc2eee 100755 --- a/tests/command/t-test-1-sample-missing-anal.sh +++ b/tests/command/t-test-1-sample-missing-anal.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -96,7 +97,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" diff --git a/tests/command/t-test-1-sample-missing-list.sh b/tests/command/t-test-1-sample-missing-list.sh index 3f8c1acb..12865181 100755 --- a/tests/command/t-test-1-sample-missing-list.sh +++ b/tests/command/t-test-1-sample-missing-list.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -96,7 +97,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare outputs" diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh index 25a1ab95..a24bb174 100755 --- a/tests/command/t-test-1s.sh +++ b/tests/command/t-test-1s.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/t-test-groups.sh b/tests/command/t-test-groups.sh index af93dba8..97963226 100755 --- a/tests/command/t-test-groups.sh +++ b/tests/command/t-test-groups.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -76,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/t-test-indep-missing-anal.sh b/tests/command/t-test-indep-missing-anal.sh index 563f7e54..6719faf8 100755 --- a/tests/command/t-test-indep-missing-anal.sh +++ b/tests/command/t-test-indep-missing-anal.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -97,7 +98,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh index 9cf7b0a2..ec97144d 100755 --- a/tests/command/t-test-indep-missing-list.sh +++ b/tests/command/t-test-indep-missing-list.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -95,7 +96,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-paired-missing-anal.sh b/tests/command/t-test-paired-missing-anal.sh index 4b25c11c..b0d34647 100755 --- a/tests/command/t-test-paired-missing-anal.sh +++ b/tests/command/t-test-paired-missing-anal.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -95,7 +96,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-paired-missing-list.sh b/tests/command/t-test-paired-missing-list.sh index a270c271..d26fe304 100755 --- a/tests/command/t-test-paired-missing-list.sh +++ b/tests/command/t-test-paired-missing-list.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -69,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 1" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="copy output" @@ -95,7 +96,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program 2" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh index ec38c50e..0deef6da 100755 --- a/tests/command/t-test-pairs.sh +++ b/tests/command/t-test-pairs.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -68,7 +69,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/command/tabs.sh b/tests/command/tabs.sh index b6333f73..d93fd178 100755 --- a/tests/command/tabs.sh +++ b/tests/command/tabs.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -73,7 +74,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/tabs.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/tabs.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh index b4a84926..bb8cc227 100755 --- a/tests/command/trimmed-mean.sh +++ b/tests/command/trimmed-mean.sh @@ -10,6 +10,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -73,7 +74,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/use.sh b/tests/command/use.sh index 4e217b1f..31036857 100755 --- a/tests/command/use.sh +++ b/tests/command/use.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -74,7 +75,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TEMPDIR/filter.stat +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TEMPDIR/filter.stat if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/command/weight.sh b/tests/command/weight.sh index aadc0d5c..357e1ec6 100755 --- a/tests/command/weight.sh +++ b/tests/command/weight.sh @@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -65,7 +66,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh index b8d88fa9..27184e08 100755 --- a/tests/expressions/epoch.sh +++ b/tests/expressions/epoch.sh @@ -9,6 +9,7 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi if [ -z "$top_builddir" ] ; then top_builddir=. ; fi top_srcdir=`cd $top_srcdir; pwd` top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp STAT_CONFIG_PATH=$top_srcdir/config @@ -137,7 +138,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out activity="compare results" perl -pi -e 's/^\s*$//g' $TEMPDIR/epoch.out diff --git a/tests/expressions/expressions.sh b/tests/expressions/expressions.sh index b21fb8e1..9bfd90ca 100755 --- a/tests/expressions/expressions.sh +++ b/tests/expressions/expressions.sh @@ -8,6 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -1303,7 +1304,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run optimizing program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ $TEMPDIR/expr-opt.stat >$TEMPDIR/expr-opt.err 2> $TEMPDIR/expr-opt.out activity="compare optimizing output" @@ -1319,7 +1320,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-noopt.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run non-optimizing program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ $TEMPDIR/expr-noopt.stat >$TEMPDIR/expr-noopt.err 2> $TEMPDIR/expr-noopt.out activity="compare non-optimizing output" @@ -1335,7 +1336,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt-pos.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run optimizing postfix program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ $TEMPDIR/expr-opt-pos.stat >$TEMPDIR/expr-opt-pos.err 2> $TEMPDIR/expr-opt-pos.out if [ $? -eq 0 ] ; then no_result ; fi @@ -1347,7 +1348,7 @@ sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-noopt-pos.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run non-optimizing postfix program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ $TEMPDIR/expr-noopt-pos.stat >$TEMPDIR/expr-noopt-pos.err 2> $TEMPDIR/expr-noopt-pos.out if [ $? -eq 0 ] ; then no_result ; fi diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh index 7602aede..b1c9f440 100755 --- a/tests/expressions/randist.sh +++ b/tests/expressions/randist.sh @@ -9,6 +9,7 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi if [ -z "$top_builddir" ] ; then top_builddir=. ; fi top_srcdir=`cd $top_srcdir; pwd` top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp STAT_CONFIG_PATH=$top_srcdir/config @@ -59,7 +60,7 @@ perl $top_srcdir/tests/expressions/randist/randist.pl \ if [ $? -ne 0 ] ; then no_result ; fi activity="run command file" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ $TEMPDIR/randist.pspp >$TEMPDIR/randist.err 2> $TEMPDIR/randist.out if [ $? -ne 0 ] ; then fail ; fi diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh index fe174b41..3a2a3c2b 100755 --- a/tests/expressions/variables.sh +++ b/tests/expressions/variables.sh @@ -9,6 +9,7 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi if [ -z "$top_builddir" ] ; then top_builddir=. ; fi top_srcdir=`cd $top_srcdir; pwd` top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp STAT_CONFIG_PATH=$top_srcdir/config export STAT_CONFIG_PATH @@ -94,7 +95,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out if [ $? -ne 0 ] ; then fail ; fi activity="compare results" diff --git a/tests/expressions/vectors.sh b/tests/expressions/vectors.sh index 6e7243bf..52b9be62 100755 --- a/tests/expressions/vectors.sh +++ b/tests/expressions/vectors.sh @@ -9,6 +9,7 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi if [ -z "$top_builddir" ] ; then top_builddir=. ; fi top_srcdir=`cd $top_srcdir; pwd` top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp STAT_CONFIG_PATH=$top_srcdir/config export STAT_CONFIG_PATH @@ -70,7 +71,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/vectors.stat > $TEMPDIR/vectors.err 2> $TEMPDIR/vectors.out +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/vectors.stat > $TEMPDIR/vectors.err 2> $TEMPDIR/vectors.out if [ $? -ne 0 ] ; then fail ; fi activity="compare results" diff --git a/tests/stats/descript-basic.sh b/tests/stats/descript-basic.sh index 59657e02..0a8dc114 100755 --- a/tests/stats/descript-basic.sh +++ b/tests/stats/descript-basic.sh @@ -8,6 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -75,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/descript.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/descript.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/descript-mean-bug.sh b/tests/stats/descript-mean-bug.sh index 529292ce..a34286de 100755 --- a/tests/stats/descript-mean-bug.sh +++ b/tests/stats/descript-mean-bug.sh @@ -9,6 +9,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -70,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/descript.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/descript.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/descript-missing.sh b/tests/stats/descript-missing.sh index adc5a7ba..8d0de7d6 100755 --- a/tests/stats/descript-missing.sh +++ b/tests/stats/descript-missing.sh @@ -8,6 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -76,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/descript.stat +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/descript.stat if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/moments.sh b/tests/stats/moments.sh index efee8ae1..63c9a17a 100755 --- a/tests/stats/moments.sh +++ b/tests/stats/moments.sh @@ -8,6 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -80,7 +81,7 @@ sed < $TEMPDIR/moments-list-2p >> $TEMPDIR/moments-2p.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run two-pass program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ $TEMPDIR/moments-2p.stat >$TEMPDIR/moments-2p.err 2> $TEMPDIR/moments-2p.out activity="compare two-pass output" @@ -94,7 +95,7 @@ sed < $TEMPDIR/moments-list-1p >> $TEMPDIR/moments-1p.stat \ if [ $? -ne 0 ] ; then no_result ; fi activity="run one-pass program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \ +$SUPERVISOR $PSPP --testing-mode -o raw-ascii \ $TEMPDIR/moments-1p.stat >$TEMPDIR/moments-1p.err 2> $TEMPDIR/moments-1p.out activity="compare one-pass output" diff --git a/tests/stats/ntiles.sh b/tests/stats/ntiles.sh index ece67c49..66b49a75 100755 --- a/tests/stats/ntiles.sh +++ b/tests/stats/ntiles.sh @@ -8,6 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -73,7 +74,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="move output" @@ -102,7 +103,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output" diff --git a/tests/stats/percentiles-compatible.sh b/tests/stats/percentiles-compatible.sh index 0d3cf3f5..d5a6f9f1 100755 --- a/tests/stats/percentiles-compatible.sh +++ b/tests/stats/percentiles-compatible.sh @@ -9,6 +9,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -75,7 +76,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" diff --git a/tests/stats/percentiles-enhanced.sh b/tests/stats/percentiles-enhanced.sh index f7033d07..4a2c167e 100755 --- a/tests/stats/percentiles-enhanced.sh +++ b/tests/stats/percentiles-enhanced.sh @@ -9,6 +9,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -74,7 +75,7 @@ EOF if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" @@ -137,7 +138,7 @@ if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" @@ -198,7 +199,7 @@ if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" @@ -258,7 +259,7 @@ if [ $? -ne 0 ] ; then no_result; fi activity="run program $i" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/prog.sps if [ $? -ne 0 ] ; then no_result ; fi activity="compare output $i" diff --git a/tests/test_template b/tests/test_template index bb862fef..bb1c17ee 100755 --- a/tests/test_template +++ b/tests/test_template @@ -11,6 +11,8 @@ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi top_srcdir=`cd $top_srcdir; pwd` top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp + export STAT_CONFIG_PATH=$top_srcdir/config @@ -56,7 +58,7 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE +$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi diff --git a/tests/xforms/casefile.sh b/tests/xforms/casefile.sh index 8aa61d12..46e97eab 100755 --- a/tests/xforms/casefile.sh +++ b/tests/xforms/casefile.sh @@ -8,6 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi top_builddir=`cd $top_builddir; pwd` +PSPP=$top_builddir/src/ui/terminal/pspp # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -57,7 +58,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode $TEMPDIR/casefile.stat > $TEMPDIR/casefile.out +$SUPERVISOR $PSPP --testing-mode $TEMPDIR/casefile.stat > $TEMPDIR/casefile.out if [ $? -ne 0 ] ; then no_result ; fi activity="compare results" -- 2.30.2