pspp-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pspp-cvs] pspp src/ChangeLog src/automake.mk src/data/Cha...


From: John Darrington
Subject: [Pspp-cvs] pspp src/ChangeLog src/automake.mk src/data/Cha...
Date: Sat, 11 Mar 2006 07:16:41 +0000

CVSROOT:        /sources/pspp
Module name:    pspp
Branch:         
Changes by:     John Darrington <address@hidden>        06/03/11 07:16:40

Modified files:
        src            : ChangeLog automake.mk 
        src/data       : ChangeLog settings.c 
        src/output/charts: automake.mk 
        src/ui/terminal: ChangeLog automake.mk 
        tests          : ChangeLog test_template 
        tests/bugs     : agg-crash-2.sh agg_crash.sh alpha-freq.sh 
                         big-input-2.sh big-input.sh comment-at-eof.sh 
                         compression.sh compute-fmt.sh compute-lv.sh 
                         computebug.sh crosstabs-crash.sh crosstabs.sh 
                         curtailed.sh data-crash.sh double-frequency.sh 
                         examine-1sample.sh examine-missing.sh 
                         get-no-file.sh get.sh html-frequency.sh 
                         if_crash.sh input-crash.sh lag_crash.sh 
                         match-files-scratch.sh multipass.sh random.sh 
                         recode-copy-bug.sh t-test-alpha.sh 
                         t-test-alpha2.sh t-test-with-temp.sh t-test.sh 
                         temp-freq.sh temporary.sh 
                         val-labs-trailing-slash.sh val-labs.sh 
        tests/command  : aggregate.sh autorecod.sh beg-data.sh bignum.sh 
                         count.sh data-list.sh do-repeat.sh erase.sh 
                         examine-extremes.sh examine-percentiles.sh 
                         examine.sh file-handle.sh file-label.sh 
                         filter.sh flip.sh import-export.sh lag.sh 
                         list.sh longvars.sh loop.sh match-files.sh 
                         missing-values.sh no_case_size.sh 
                         oneway-missing.sh oneway-with-splits.sh 
                         oneway.sh permissions.sh print.sh rename.sh 
                         sample.sh sort.sh split-file.sh sysfile-info.sh 
                         sysfiles-old.sh sysfiles.sh 
                         t-test-1-indep-val.sh 
                         t-test-1-sample-missing-anal.sh 
                         t-test-1-sample-missing-list.sh t-test-1s.sh 
                         t-test-groups.sh t-test-indep-missing-anal.sh 
                         t-test-indep-missing-list.sh 
                         t-test-paired-missing-anal.sh 
                         t-test-paired-missing-list.sh t-test-pairs.sh 
                         tabs.sh trimmed-mean.sh use.sh weight.sh 
        tests/expressions: epoch.sh expressions.sh randist.sh 
                           variables.sh vectors.sh 
        tests/stats    : descript-basic.sh descript-mean-bug.sh 
                         descript-missing.sh moments.sh ntiles.sh 
                         percentiles-compatible.sh 
                         percentiles-enhanced.sh 
        tests/xforms   : casefile.sh 

Log message:
        Changed the default value od SCOMPRESS to true.
        Moved the pspp binary to src/ui/terminal and updated tests accordingly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ChangeLog.diff?tr1=1.266&tr2=1.267&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/settings.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/charts/automake.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/automake.mk.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/ChangeLog.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/test_template.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/agg-crash-2.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/agg_crash.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/alpha-freq.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/big-input-2.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/big-input.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/comment-at-eof.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/compression.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/compute-fmt.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/compute-lv.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/computebug.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/crosstabs-crash.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/crosstabs.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/curtailed.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/data-crash.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/double-frequency.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/examine-1sample.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/examine-missing.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/get-no-file.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/get.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/html-frequency.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/if_crash.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/input-crash.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/lag_crash.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/match-files-scratch.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/multipass.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/random.sh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/recode-copy-bug.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/t-test-alpha.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/t-test-alpha2.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/t-test-with-temp.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/t-test.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/temp-freq.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/temporary.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/val-labs-trailing-slash.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/bugs/val-labs.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/aggregate.sh.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/autorecod.sh.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/beg-data.sh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/bignum.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/count.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/data-list.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/do-repeat.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/erase.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/examine-extremes.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/examine-percentiles.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/examine.sh.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/file-handle.sh.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/file-label.sh.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/filter.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/flip.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/import-export.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/lag.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/list.sh.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/longvars.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/loop.sh.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/match-files.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/missing-values.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/no_case_size.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/oneway-missing.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/oneway-with-splits.sh.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/oneway.sh.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/permissions.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/print.sh.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/rename.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/sample.sh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/sort.sh.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/split-file.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/sysfile-info.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/sysfiles-old.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/sysfiles.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-1-indep-val.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-1-sample-missing-anal.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-1-sample-missing-list.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-1s.sh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-groups.sh.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-indep-missing-anal.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-indep-missing-list.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-paired-missing-anal.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-paired-missing-list.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/t-test-pairs.sh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/tabs.sh.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/trimmed-mean.sh.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/use.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/command/weight.sh.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/expressions/epoch.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/expressions/expressions.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/expressions/randist.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/expressions/variables.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/expressions/vectors.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/stats/descript-basic.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/stats/descript-mean-bug.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/stats/descript-missing.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/stats/moments.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/stats/ntiles.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/stats/percentiles-compatible.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/stats/percentiles-enhanced.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/tests/xforms/casefile.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: pspp/src/ChangeLog
diff -u pspp/src/ChangeLog:1.266 pspp/src/ChangeLog:1.267
--- pspp/src/ChangeLog:1.266    Sat Mar  4 21:00:38 2006
+++ pspp/src/ChangeLog  Sat Mar 11 07:16:39 2006
@@ -1,3 +1,10 @@
+Sat Mar 11 14:17:47 WST 2006 John Darrington <address@hidden>
+
+       * 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  <address@hidden>
 
        * In many source files, #include "compiler.h" to get GCC attribute
Index: pspp/src/automake.mk
diff -u pspp/src/automake.mk:1.1 pspp/src/automake.mk:1.2
--- pspp/src/automake.mk:1.1    Sat Mar  4 00:53:47 2006
+++ pspp/src/automake.mk        Sat Mar 11 07:16:39 2006
@@ -14,44 +14,18 @@
 endif
 
 
-src/%: AM_CPPFLAGS += \
- -I$(top_srcdir)/src/math  \
- -I$(top_srcdir)/src/ui/terminal \
- -I$(top_srcdir)/src/libpspp \
- -I$(top_srcdir)/src/data \
- -I$(top_srcdir)/src/output \
+src/message.o: AM_CPPFLAGS += \
  -I$(top_srcdir)/src/language \
  -I$(top_srcdir)/src/language/lexer \
- -I$(top_srcdir)/src/language/control
-
-
-bin_PROGRAMS += src/pspp
+ -I$(top_srcdir)/src/ui/terminal \
+ -I$(top_srcdir)/src/data \
+ -I$(top_srcdir)/src/libpspp
 
-src_pspp_SOURCES =                                     \
-       src/message.c                                   \
-       src/procedure.c  src/procedure.h 
+src/procedure.o: AM_CPPFLAGS += \
+ -I$(top_srcdir)/src/language \
+ -I$(top_srcdir)/src/language/control \
+ -I$(top_srcdir)/src/output \
+ -I$(top_srcdir)/src/data \
+ -I$(top_srcdir)/src/libpspp
 
-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@
-       
 
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.3 pspp/src/data/ChangeLog:1.4
--- pspp/src/data/ChangeLog:1.3 Sat Mar  4 21:26:39 2006
+++ pspp/src/data/ChangeLog     Sat Mar 11 07:16:39 2006
@@ -1,3 +1,7 @@
+Sat Mar 11 15:06:07 WST 2006 John Darrington <address@hidden>
+
+       * settings.c: Changed default value of scompress to true.
+
 Sat Mar  4 13:22:51 2006  Ben Pfaff  <address@hidden>
 
        * sfm-private.h: Include variable.h, to get SHORT_NAME_LEN.
Index: pspp/src/data/settings.c
diff -u pspp/src/data/settings.c:1.1 pspp/src/data/settings.c:1.2
--- pspp/src/data/settings.c:1.1        Sat Mar  4 01:11:57 2006
+++ pspp/src/data/settings.c    Sat Mar 11 07:16:40 2006
@@ -42,7 +42,7 @@
 
 static bool errorbreak = false;
 
-static bool scompress = false;
+static bool scompress = true;
 
 static bool undefined = true;
 static double blanks = SYSMIS;
Index: pspp/src/output/charts/automake.mk
diff -u pspp/src/output/charts/automake.mk:1.2 
pspp/src/output/charts/automake.mk:1.3
--- pspp/src/output/charts/automake.mk:1.2      Sat Mar  4 21:26:39 2006
+++ pspp/src/output/charts/automake.mk  Sat Mar 11 07:16:40 2006
@@ -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 \
Index: pspp/src/ui/terminal/ChangeLog
diff -u pspp/src/ui/terminal/ChangeLog:1.1 pspp/src/ui/terminal/ChangeLog:1.2
--- pspp/src/ui/terminal/ChangeLog:1.1  Sat Mar  4 01:11:58 2006
+++ pspp/src/ui/terminal/ChangeLog      Sat Mar 11 07:16:40 2006
@@ -1,3 +1,7 @@
+Sat Mar 11 14:18:39 WST 2006 John Darrington <address@hidden>
+
+       * automake.mk: Moved the pspp binary here.
+
 Thu Mar  2 08:40:33 WST 2006 John Darrington <address@hidden>
        
        * Moved files from src directory
Index: pspp/src/ui/terminal/automake.mk
diff -u pspp/src/ui/terminal/automake.mk:1.1 
pspp/src/ui/terminal/automake.mk:1.2
--- pspp/src/ui/terminal/automake.mk:1.1        Sat Mar  4 01:18:14 2006
+++ pspp/src/ui/terminal/automake.mk    Sat Mar 11 07:16:40 2006
@@ -15,3 +15,34 @@
  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@
+
Index: pspp/tests/ChangeLog
diff -u pspp/tests/ChangeLog:1.50 pspp/tests/ChangeLog:1.51
--- pspp/tests/ChangeLog:1.50   Sat Mar  4 00:28:15 2006
+++ pspp/tests/ChangeLog        Sat Mar 11 07:16:40 2006
@@ -1,3 +1,6 @@
+Sat Mar 11 14:16:01 WST 2006 John Darrington <address@hidden>
+
+       * 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  <address@hidden>
Index: pspp/tests/bugs/agg-crash-2.sh
diff -u pspp/tests/bugs/agg-crash-2.sh:1.10 pspp/tests/bugs/agg-crash-2.sh:1.11
--- pspp/tests/bugs/agg-crash-2.sh:1.10 Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/agg-crash-2.sh      Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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
 
-$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
Index: pspp/tests/bugs/agg_crash.sh
diff -u pspp/tests/bugs/agg_crash.sh:1.5 pspp/tests/bugs/agg_crash.sh:1.6
--- pspp/tests/bugs/agg_crash.sh:1.5    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/agg_crash.sh        Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 # 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
 
 
Index: pspp/tests/bugs/alpha-freq.sh
diff -u pspp/tests/bugs/alpha-freq.sh:1.6 pspp/tests/bugs/alpha-freq.sh:1.7
--- pspp/tests/bugs/alpha-freq.sh:1.6   Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/alpha-freq.sh       Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 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
 
 
Index: pspp/tests/bugs/big-input-2.sh
diff -u pspp/tests/bugs/big-input-2.sh:1.9 pspp/tests/bugs/big-input-2.sh:1.10
--- pspp/tests/bugs/big-input-2.sh:1.9  Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/big-input-2.sh      Sat Mar 11 07:16:40 2006
@@ -12,6 +12,7 @@
 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 > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="appending to data"
@@ -87,7 +88,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
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;
Index: pspp/tests/bugs/big-input.sh
diff -u pspp/tests/bugs/big-input.sh:1.6 pspp/tests/bugs/big-input.sh:1.7
--- pspp/tests/bugs/big-input.sh:1.6    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/big-input.sh        Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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/foo.sps > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/foo.sps > /dev/null
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;
Index: pspp/tests/bugs/comment-at-eof.sh
diff -u pspp/tests/bugs/comment-at-eof.sh:1.5 
pspp/tests/bugs/comment-at-eof.sh:1.6
--- pspp/tests/bugs/comment-at-eof.sh:1.5       Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/comment-at-eof.sh   Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 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;
Index: pspp/tests/bugs/compression.sh
diff -u pspp/tests/bugs/compression.sh:1.1 pspp/tests/bugs/compression.sh:1.2
--- pspp/tests/bugs/compression.sh:1.1  Sat Mar  4 05:01:06 2006
+++ pspp/tests/bugs/compression.sh      Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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
Index: pspp/tests/bugs/compute-fmt.sh
diff -u pspp/tests/bugs/compute-fmt.sh:1.5 pspp/tests/bugs/compute-fmt.sh:1.6
--- pspp/tests/bugs/compute-fmt.sh:1.5  Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/compute-fmt.sh      Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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
 
-$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
 
 
Index: pspp/tests/bugs/compute-lv.sh
diff -u pspp/tests/bugs/compute-lv.sh:1.8 pspp/tests/bugs/compute-lv.sh:1.9
--- pspp/tests/bugs/compute-lv.sh:1.8   Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/compute-lv.sh       Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 activity="run prog"
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 
Index: pspp/tests/bugs/computebug.sh
diff -u pspp/tests/bugs/computebug.sh:1.7 pspp/tests/bugs/computebug.sh:1.8
--- pspp/tests/bugs/computebug.sh:1.7   Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/computebug.sh       Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/bugs/crosstabs-crash.sh
diff -u pspp/tests/bugs/crosstabs-crash.sh:1.7 
pspp/tests/bugs/crosstabs-crash.sh:1.8
--- pspp/tests/bugs/crosstabs-crash.sh:1.7      Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/crosstabs-crash.sh  Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 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
 
 
Index: pspp/tests/bugs/crosstabs.sh
diff -u pspp/tests/bugs/crosstabs.sh:1.6 pspp/tests/bugs/crosstabs.sh:1.7
--- pspp/tests/bugs/crosstabs.sh:1.6    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/crosstabs.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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
 
 
-$SUPERVISOR $top_builddir/src/pspp $TEMPDIR/ct.stat
+$SUPERVISOR $PSPP $TEMPDIR/ct.stat
 if [ $? -ne 0 ] ; then fail ; fi
 
 
Index: pspp/tests/bugs/curtailed.sh
diff -u pspp/tests/bugs/curtailed.sh:1.4 pspp/tests/bugs/curtailed.sh:1.5
--- pspp/tests/bugs/curtailed.sh:1.4    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/curtailed.sh        Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 #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
 
 
Index: pspp/tests/bugs/data-crash.sh
diff -u pspp/tests/bugs/data-crash.sh:1.7 pspp/tests/bugs/data-crash.sh:1.8
--- pspp/tests/bugs/data-crash.sh:1.7   Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/data-crash.sh       Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 #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
 
 
Index: pspp/tests/bugs/double-frequency.sh
diff -u pspp/tests/bugs/double-frequency.sh:1.8 
pspp/tests/bugs/double-frequency.sh:1.9
--- pspp/tests/bugs/double-frequency.sh:1.8     Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/double-frequency.sh Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 cd $TEMPDIR
 
 activity="run data"
-$SUPERVISOR $top_builddir/src/pspp  $TEMPDIR/ff.stat
+$SUPERVISOR $PSPP  $TEMPDIR/ff.stat
 if [ $? -ne 0 ] ; then fail ; fi
 
 
Index: pspp/tests/bugs/examine-1sample.sh
diff -u pspp/tests/bugs/examine-1sample.sh:1.6 
pspp/tests/bugs/examine-1sample.sh:1.7
--- pspp/tests/bugs/examine-1sample.sh:1.6      Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/examine-1sample.sh  Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 fail ; fi
 
 pass
Index: pspp/tests/bugs/examine-missing.sh
diff -u pspp/tests/bugs/examine-missing.sh:1.2 
pspp/tests/bugs/examine-missing.sh:1.3
--- pspp/tests/bugs/examine-missing.sh:1.2      Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/examine-missing.sh  Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 > /dev/null
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE > /dev/null
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;
Index: pspp/tests/bugs/get-no-file.sh
diff -u pspp/tests/bugs/get-no-file.sh:1.4 pspp/tests/bugs/get-no-file.sh:1.5
--- pspp/tests/bugs/get-no-file.sh:1.4  Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/get-no-file.sh      Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 # 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
Index: pspp/tests/bugs/get.sh
diff -u pspp/tests/bugs/get.sh:1.9 pspp/tests/bugs/get.sh:1.10
--- pspp/tests/bugs/get.sh:1.9  Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/get.sh      Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/bugs/html-frequency.sh
diff -u pspp/tests/bugs/html-frequency.sh:1.10 
pspp/tests/bugs/html-frequency.sh:1.11
--- pspp/tests/bugs/html-frequency.sh:1.10      Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/html-frequency.sh   Sat Mar 11 07:16:40 2006
@@ -12,6 +12,7 @@
 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 @@
 cd $TEMPDIR
 
 activity="run data"
-$SUPERVISOR $top_builddir/src/pspp -o html $TESTFILE
+$SUPERVISOR $PSPP -o html $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 
Index: pspp/tests/bugs/if_crash.sh
diff -u pspp/tests/bugs/if_crash.sh:1.4 pspp/tests/bugs/if_crash.sh:1.5
--- pspp/tests/bugs/if_crash.sh:1.4     Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/if_crash.sh Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 # 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
 
 
Index: pspp/tests/bugs/input-crash.sh
diff -u pspp/tests/bugs/input-crash.sh:1.4 pspp/tests/bugs/input-crash.sh:1.5
--- pspp/tests/bugs/input-crash.sh:1.4  Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/input-crash.sh      Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 # 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
 
 
Index: pspp/tests/bugs/lag_crash.sh
diff -u pspp/tests/bugs/lag_crash.sh:1.4 pspp/tests/bugs/lag_crash.sh:1.5
--- pspp/tests/bugs/lag_crash.sh:1.4    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/lag_crash.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 activity="run_program"
-$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null
+$SUPERVISOR $PSPP $TESTFILE > /dev/null
 if [ $? -ne 0 ] ; then fail ; fi
 
 
Index: pspp/tests/bugs/match-files-scratch.sh
diff -u pspp/tests/bugs/match-files-scratch.sh:1.7 
pspp/tests/bugs/match-files-scratch.sh:1.8
--- pspp/tests/bugs/match-files-scratch.sh:1.7  Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/match-files-scratch.sh      Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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
 
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
Index: pspp/tests/bugs/multipass.sh
diff -u pspp/tests/bugs/multipass.sh:1.9 pspp/tests/bugs/multipass.sh:1.10
--- pspp/tests/bugs/multipass.sh:1.9    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/multipass.sh        Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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
 
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
Index: pspp/tests/bugs/random.sh
diff -u pspp/tests/bugs/random.sh:1.11 pspp/tests/bugs/random.sh:1.12
--- pspp/tests/bugs/random.sh:1.11      Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/random.sh   Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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
 
 
Index: pspp/tests/bugs/recode-copy-bug.sh
diff -u pspp/tests/bugs/recode-copy-bug.sh:1.8 
pspp/tests/bugs/recode-copy-bug.sh:1.9
--- pspp/tests/bugs/recode-copy-bug.sh:1.8      Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/recode-copy-bug.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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 @@
 
 
 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
 
 
Index: pspp/tests/bugs/t-test-alpha.sh
diff -u pspp/tests/bugs/t-test-alpha.sh:1.10 
pspp/tests/bugs/t-test-alpha.sh:1.11
--- pspp/tests/bugs/t-test-alpha.sh:1.10        Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/t-test-alpha.sh     Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/bugs/t-test-alpha2.sh
diff -u pspp/tests/bugs/t-test-alpha2.sh:1.6 
pspp/tests/bugs/t-test-alpha2.sh:1.7
--- pspp/tests/bugs/t-test-alpha2.sh:1.6        Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/t-test-alpha2.sh    Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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
 
Index: pspp/tests/bugs/t-test-with-temp.sh
diff -u pspp/tests/bugs/t-test-with-temp.sh:1.8 
pspp/tests/bugs/t-test-with-temp.sh:1.9
--- pspp/tests/bugs/t-test-with-temp.sh:1.8     Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/t-test-with-temp.sh Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/bugs/t-test.sh
diff -u pspp/tests/bugs/t-test.sh:1.6 pspp/tests/bugs/t-test.sh:1.7
--- pspp/tests/bugs/t-test.sh:1.6       Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/t-test.sh   Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
 
 #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;
Index: pspp/tests/bugs/temp-freq.sh
diff -u pspp/tests/bugs/temp-freq.sh:1.7 pspp/tests/bugs/temp-freq.sh:1.8
--- pspp/tests/bugs/temp-freq.sh:1.7    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/temp-freq.sh        Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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
 
-$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
Index: pspp/tests/bugs/temporary.sh
diff -u pspp/tests/bugs/temporary.sh:1.8 pspp/tests/bugs/temporary.sh:1.9
--- pspp/tests/bugs/temporary.sh:1.8    Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/temporary.sh        Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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
 
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
Index: pspp/tests/bugs/val-labs-trailing-slash.sh
diff -u pspp/tests/bugs/val-labs-trailing-slash.sh:1.6 
pspp/tests/bugs/val-labs-trailing-slash.sh:1.7
--- pspp/tests/bugs/val-labs-trailing-slash.sh:1.6      Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/val-labs-trailing-slash.sh  Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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
Index: pspp/tests/bugs/val-labs.sh
diff -u pspp/tests/bugs/val-labs.sh:1.6 pspp/tests/bugs/val-labs.sh:1.7
--- pspp/tests/bugs/val-labs.sh:1.6     Sat Mar  4 00:28:15 2006
+++ pspp/tests/bugs/val-labs.sh Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
 
 #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;
Index: pspp/tests/command/aggregate.sh
diff -u pspp/tests/command/aggregate.sh:1.15 
pspp/tests/command/aggregate.sh:1.16
--- pspp/tests/command/aggregate.sh:1.15        Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/aggregate.sh     Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
            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"
Index: pspp/tests/command/autorecod.sh
diff -u pspp/tests/command/autorecod.sh:1.12 
pspp/tests/command/autorecod.sh:1.13
--- pspp/tests/command/autorecod.sh:1.12        Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/autorecod.sh     Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 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"
Index: pspp/tests/command/beg-data.sh
diff -u pspp/tests/command/beg-data.sh:1.11 pspp/tests/command/beg-data.sh:1.12
--- pspp/tests/command/beg-data.sh:1.11 Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/beg-data.sh      Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/bignum.sh
diff -u pspp/tests/command/bignum.sh:1.7 pspp/tests/command/bignum.sh:1.8
--- pspp/tests/command/bignum.sh:1.7    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/bignum.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 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 ...
Index: pspp/tests/command/count.sh
diff -u pspp/tests/command/count.sh:1.10 pspp/tests/command/count.sh:1.11
--- pspp/tests/command/count.sh:1.10    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/count.sh Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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
 
 
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
Index: pspp/tests/command/data-list.sh
diff -u pspp/tests/command/data-list.sh:1.9 pspp/tests/command/data-list.sh:1.10
--- pspp/tests/command/data-list.sh:1.9 Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/data-list.sh     Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/do-repeat.sh
diff -u pspp/tests/command/do-repeat.sh:1.1 pspp/tests/command/do-repeat.sh:1.2
--- pspp/tests/command/do-repeat.sh:1.1 Sat Mar  4 01:11:58 2006
+++ pspp/tests/command/do-repeat.sh     Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 --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"
Index: pspp/tests/command/erase.sh
diff -u pspp/tests/command/erase.sh:1.6 pspp/tests/command/erase.sh:1.7
--- pspp/tests/command/erase.sh:1.6     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/erase.sh Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 # 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 @@
 
 
 activity="run prog 1"
-$SUPERVISOR $top_builddir/src/pspp $TESTFILE
+$SUPERVISOR $PSPP $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 # foobar should now be gone
Index: pspp/tests/command/examine-extremes.sh
diff -u pspp/tests/command/examine-extremes.sh:1.9 
pspp/tests/command/examine-extremes.sh:1.10
--- pspp/tests/command/examine-extremes.sh:1.9  Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/examine-extremes.sh      Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/examine-percentiles.sh
diff -u pspp/tests/command/examine-percentiles.sh:1.10 
pspp/tests/command/examine-percentiles.sh:1.11
--- pspp/tests/command/examine-percentiles.sh:1.10      Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/examine-percentiles.sh   Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
 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
 
 
Index: pspp/tests/command/examine.sh
diff -u pspp/tests/command/examine.sh:1.13 pspp/tests/command/examine.sh:1.14
--- pspp/tests/command/examine.sh:1.13  Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/examine.sh       Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
Index: pspp/tests/command/file-handle.sh
diff -u pspp/tests/command/file-handle.sh:1.3 
pspp/tests/command/file-handle.sh:1.4
--- pspp/tests/command/file-handle.sh:1.3       Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/file-handle.sh   Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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
 
 
Index: pspp/tests/command/file-label.sh
diff -u pspp/tests/command/file-label.sh:1.12 
pspp/tests/command/file-label.sh:1.13
--- pspp/tests/command/file-label.sh:1.12       Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/file-label.sh    Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 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
Index: pspp/tests/command/filter.sh
diff -u pspp/tests/command/filter.sh:1.10 pspp/tests/command/filter.sh:1.11
--- pspp/tests/command/filter.sh:1.10   Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/filter.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/flip.sh
diff -u pspp/tests/command/flip.sh:1.10 pspp/tests/command/flip.sh:1.11
--- pspp/tests/command/flip.sh:1.10     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/flip.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/import-export.sh
diff -u pspp/tests/command/import-export.sh:1.10 
pspp/tests/command/import-export.sh:1.11
--- pspp/tests/command/import-export.sh:1.10    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/import-export.sh Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/lag.sh
diff -u pspp/tests/command/lag.sh:1.10 pspp/tests/command/lag.sh:1.11
--- pspp/tests/command/lag.sh:1.10      Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/lag.sh   Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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/lag.stat
+$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/lag.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare result"
Index: pspp/tests/command/list.sh
diff -u pspp/tests/command/list.sh:1.15 pspp/tests/command/list.sh:1.16
--- pspp/tests/command/list.sh:1.15     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/list.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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
 
 
Index: pspp/tests/command/longvars.sh
diff -u pspp/tests/command/longvars.sh:1.8 pspp/tests/command/longvars.sh:1.9
--- pspp/tests/command/longvars.sh:1.8  Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/longvars.sh      Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/loop.sh
diff -u pspp/tests/command/loop.sh:1.13 pspp/tests/command/loop.sh:1.14
--- pspp/tests/command/loop.sh:1.13     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/loop.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 
$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"
Index: pspp/tests/command/match-files.sh
diff -u pspp/tests/command/match-files.sh:1.8 
pspp/tests/command/match-files.sh:1.9
--- pspp/tests/command/match-files.sh:1.8       Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/match-files.sh   Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
        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 @@
 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 @@
 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"
Index: pspp/tests/command/missing-values.sh
diff -u pspp/tests/command/missing-values.sh:1.2 
pspp/tests/command/missing-values.sh:1.3
--- pspp/tests/command/missing-values.sh:1.2    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/missing-values.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
 
Index: pspp/tests/command/no_case_size.sh
diff -u pspp/tests/command/no_case_size.sh:1.7 
pspp/tests/command/no_case_size.sh:1.8
--- pspp/tests/command/no_case_size.sh:1.7      Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/no_case_size.sh  Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/oneway-missing.sh
diff -u pspp/tests/command/oneway-missing.sh:1.5 
pspp/tests/command/oneway-missing.sh:1.6
--- pspp/tests/command/oneway-missing.sh:1.5    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/oneway-missing.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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 @@
 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 @@
 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"
Index: pspp/tests/command/oneway-with-splits.sh
diff -u pspp/tests/command/oneway-with-splits.sh:1.13 
pspp/tests/command/oneway-with-splits.sh:1.14
--- pspp/tests/command/oneway-with-splits.sh:1.13       Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/oneway-with-splits.sh    Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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
Index: pspp/tests/command/oneway.sh
diff -u pspp/tests/command/oneway.sh:1.15 pspp/tests/command/oneway.sh:1.16
--- pspp/tests/command/oneway.sh:1.15   Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/oneway.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
Index: pspp/tests/command/permissions.sh
diff -u pspp/tests/command/permissions.sh:1.5 
pspp/tests/command/permissions.sh:1.6
--- pspp/tests/command/permissions.sh:1.5       Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/permissions.sh   Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 -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 @@
 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"
Index: pspp/tests/command/print.sh
diff -u pspp/tests/command/print.sh:1.22 pspp/tests/command/print.sh:1.23
--- pspp/tests/command/print.sh:1.22    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/print.sh Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
 
Index: pspp/tests/command/rename.sh
diff -u pspp/tests/command/rename.sh:1.8 pspp/tests/command/rename.sh:1.9
--- pspp/tests/command/rename.sh:1.8    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/rename.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+PSPP=$top_builddir/src/ui/terminal/pspp
+
 
 cleanup()
 {
@@ -73,7 +76,7 @@
 
 
 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"
Index: pspp/tests/command/sample.sh
diff -u pspp/tests/command/sample.sh:1.11 pspp/tests/command/sample.sh:1.12
--- pspp/tests/command/sample.sh:1.11   Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/sample.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/sort.sh
diff -u pspp/tests/command/sort.sh:1.12 pspp/tests/command/sort.sh:1.13
--- pspp/tests/command/sort.sh:1.12     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/sort.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
   } > 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
Index: pspp/tests/command/split-file.sh
diff -u pspp/tests/command/split-file.sh:1.9 
pspp/tests/command/split-file.sh:1.10
--- pspp/tests/command/split-file.sh:1.9        Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/split-file.sh    Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 $TEMPDIR/split.stat
+$SUPERVISOR $PSPP -o raw-ascii $TEMPDIR/split.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
Index: pspp/tests/command/sysfile-info.sh
diff -u pspp/tests/command/sysfile-info.sh:1.9 
pspp/tests/command/sysfile-info.sh:1.10
--- pspp/tests/command/sysfile-info.sh:1.9      Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/sysfile-info.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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 @@
 Cases:     3
 Type:      System File.
 Weight:    Not weighted.
-Mode:      Compression off.
+Mode:      Compression on.
 +--------+-------------+---+
 |Variable|Description  |Pos|
 |        |             |iti|
Index: pspp/tests/command/sysfiles-old.sh
diff -u pspp/tests/command/sysfiles-old.sh:1.8 
pspp/tests/command/sysfiles-old.sh:1.9
--- pspp/tests/command/sysfiles-old.sh:1.8      Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/sysfiles-old.sh  Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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="check file exists"
Index: pspp/tests/command/sysfiles.sh
diff -u pspp/tests/command/sysfiles.sh:1.8 pspp/tests/command/sysfiles.sh:1.9
--- pspp/tests/command/sysfiles.sh:1.8  Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/sysfiles.sh      Sat Mar 11 07:16:40 2006
@@ -11,6 +11,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/t-test-1-indep-val.sh
diff -u pspp/tests/command/t-test-1-indep-val.sh:1.10 
pspp/tests/command/t-test-1-indep-val.sh:1.11
--- pspp/tests/command/t-test-1-indep-val.sh:1.10       Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/t-test-1-indep-val.sh    Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/t-test-1-sample-missing-anal.sh
diff -u pspp/tests/command/t-test-1-sample-missing-anal.sh:1.7 
pspp/tests/command/t-test-1-sample-missing-anal.sh:1.8
--- pspp/tests/command/t-test-1-sample-missing-anal.sh:1.7      Sat Mar  4 
00:28:15 2006
+++ pspp/tests/command/t-test-1-sample-missing-anal.sh  Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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 @@
 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"
Index: pspp/tests/command/t-test-1-sample-missing-list.sh
diff -u pspp/tests/command/t-test-1-sample-missing-list.sh:1.7 
pspp/tests/command/t-test-1-sample-missing-list.sh:1.8
--- pspp/tests/command/t-test-1-sample-missing-list.sh:1.7      Sat Mar  4 
00:28:15 2006
+++ pspp/tests/command/t-test-1-sample-missing-list.sh  Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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 @@
 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"
Index: pspp/tests/command/t-test-1s.sh
diff -u pspp/tests/command/t-test-1s.sh:1.11 
pspp/tests/command/t-test-1s.sh:1.12
--- pspp/tests/command/t-test-1s.sh:1.11        Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/t-test-1s.sh     Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/t-test-groups.sh
diff -u pspp/tests/command/t-test-groups.sh:1.12 
pspp/tests/command/t-test-groups.sh:1.13
--- pspp/tests/command/t-test-groups.sh:1.12    Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/t-test-groups.sh Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/t-test-indep-missing-anal.sh
diff -u pspp/tests/command/t-test-indep-missing-anal.sh:1.7 
pspp/tests/command/t-test-indep-missing-anal.sh:1.8
--- pspp/tests/command/t-test-indep-missing-anal.sh:1.7 Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/t-test-indep-missing-anal.sh     Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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 @@
 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
 
 
Index: pspp/tests/command/t-test-indep-missing-list.sh
diff -u pspp/tests/command/t-test-indep-missing-list.sh:1.7 
pspp/tests/command/t-test-indep-missing-list.sh:1.8
--- pspp/tests/command/t-test-indep-missing-list.sh:1.7 Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/t-test-indep-missing-list.sh     Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/t-test-paired-missing-anal.sh
diff -u pspp/tests/command/t-test-paired-missing-anal.sh:1.7 
pspp/tests/command/t-test-paired-missing-anal.sh:1.8
--- pspp/tests/command/t-test-paired-missing-anal.sh:1.7        Sat Mar  4 
00:28:15 2006
+++ pspp/tests/command/t-test-paired-missing-anal.sh    Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/t-test-paired-missing-list.sh
diff -u pspp/tests/command/t-test-paired-missing-list.sh:1.7 
pspp/tests/command/t-test-paired-missing-list.sh:1.8
--- pspp/tests/command/t-test-paired-missing-list.sh:1.7        Sat Mar  4 
00:28:15 2006
+++ pspp/tests/command/t-test-paired-missing-list.sh    Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/t-test-pairs.sh
diff -u pspp/tests/command/t-test-pairs.sh:1.11 
pspp/tests/command/t-test-pairs.sh:1.12
--- pspp/tests/command/t-test-pairs.sh:1.11     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/t-test-pairs.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/command/tabs.sh
diff -u pspp/tests/command/tabs.sh:1.11 pspp/tests/command/tabs.sh:1.12
--- pspp/tests/command/tabs.sh:1.11     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/tabs.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/trimmed-mean.sh
diff -u pspp/tests/command/trimmed-mean.sh:1.12 
pspp/tests/command/trimmed-mean.sh:1.13
--- pspp/tests/command/trimmed-mean.sh:1.12     Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/trimmed-mean.sh  Sat Mar 11 07:16:40 2006
@@ -10,6 +10,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/use.sh
diff -u pspp/tests/command/use.sh:1.8 pspp/tests/command/use.sh:1.9
--- pspp/tests/command/use.sh:1.8       Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/use.sh   Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/command/weight.sh
diff -u pspp/tests/command/weight.sh:1.16 pspp/tests/command/weight.sh:1.17
--- pspp/tests/command/weight.sh:1.16   Sat Mar  4 00:28:15 2006
+++ pspp/tests/command/weight.sh        Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/expressions/epoch.sh
diff -u pspp/tests/expressions/epoch.sh:1.7 pspp/tests/expressions/epoch.sh:1.8
--- pspp/tests/expressions/epoch.sh:1.7 Sat Mar  4 00:28:15 2006
+++ pspp/tests/expressions/epoch.sh     Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 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
Index: pspp/tests/expressions/expressions.sh
diff -u pspp/tests/expressions/expressions.sh:1.7 
pspp/tests/expressions/expressions.sh:1.8
--- pspp/tests/expressions/expressions.sh:1.7   Sat Mar  4 00:28:15 2006
+++ pspp/tests/expressions/expressions.sh       Sat Mar 11 07:16:40 2006
@@ -8,6 +8,7 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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
 
Index: pspp/tests/expressions/randist.sh
diff -u pspp/tests/expressions/randist.sh:1.6 
pspp/tests/expressions/randist.sh:1.7
--- pspp/tests/expressions/randist.sh:1.6       Sat Mar  4 00:28:15 2006
+++ pspp/tests/expressions/randist.sh   Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 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
 
Index: pspp/tests/expressions/variables.sh
diff -u pspp/tests/expressions/variables.sh:1.7 
pspp/tests/expressions/variables.sh:1.8
--- pspp/tests/expressions/variables.sh:1.7     Sat Mar  4 00:28:15 2006
+++ pspp/tests/expressions/variables.sh Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 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"
Index: pspp/tests/expressions/vectors.sh
diff -u pspp/tests/expressions/vectors.sh:1.7 
pspp/tests/expressions/vectors.sh:1.8
--- pspp/tests/expressions/vectors.sh:1.7       Sat Mar  4 00:28:15 2006
+++ pspp/tests/expressions/vectors.sh   Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 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"
Index: pspp/tests/stats/descript-basic.sh
diff -u pspp/tests/stats/descript-basic.sh:1.9 
pspp/tests/stats/descript-basic.sh:1.10
--- pspp/tests/stats/descript-basic.sh:1.9      Sat Mar  4 00:28:15 2006
+++ pspp/tests/stats/descript-basic.sh  Sat Mar 11 07:16:40 2006
@@ -8,6 +8,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/stats/descript-mean-bug.sh
diff -u pspp/tests/stats/descript-mean-bug.sh:1.7 
pspp/tests/stats/descript-mean-bug.sh:1.8
--- pspp/tests/stats/descript-mean-bug.sh:1.7   Sat Mar  4 00:28:15 2006
+++ pspp/tests/stats/descript-mean-bug.sh       Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/stats/descript-missing.sh
diff -u pspp/tests/stats/descript-missing.sh:1.9 
pspp/tests/stats/descript-missing.sh:1.10
--- pspp/tests/stats/descript-missing.sh:1.9    Sat Mar  4 00:28:15 2006
+++ pspp/tests/stats/descript-missing.sh        Sat Mar 11 07:16:40 2006
@@ -8,6 +8,7 @@
 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 @@
 
 
 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"
Index: pspp/tests/stats/moments.sh
diff -u pspp/tests/stats/moments.sh:1.6 pspp/tests/stats/moments.sh:1.7
--- pspp/tests/stats/moments.sh:1.6     Sat Mar  4 00:28:15 2006
+++ pspp/tests/stats/moments.sh Sat Mar 11 07:16:40 2006
@@ -8,6 +8,7 @@
 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 @@
 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 @@
 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"
Index: pspp/tests/stats/ntiles.sh
diff -u pspp/tests/stats/ntiles.sh:1.4 pspp/tests/stats/ntiles.sh:1.5
--- pspp/tests/stats/ntiles.sh:1.4      Sat Mar  4 00:28:15 2006
+++ pspp/tests/stats/ntiles.sh  Sat Mar 11 07:16:40 2006
@@ -8,6 +8,7 @@
 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 $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 @@
 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"
Index: pspp/tests/stats/percentiles-compatible.sh
diff -u pspp/tests/stats/percentiles-compatible.sh:1.7 
pspp/tests/stats/percentiles-compatible.sh:1.8
--- pspp/tests/stats/percentiles-compatible.sh:1.7      Sat Mar  4 00:28:15 2006
+++ pspp/tests/stats/percentiles-compatible.sh  Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 $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"
Index: pspp/tests/stats/percentiles-enhanced.sh
diff -u pspp/tests/stats/percentiles-enhanced.sh:1.7 
pspp/tests/stats/percentiles-enhanced.sh:1.8
--- pspp/tests/stats/percentiles-enhanced.sh:1.7        Sat Mar  4 00:28:15 2006
+++ pspp/tests/stats/percentiles-enhanced.sh    Sat Mar 11 07:16:40 2006
@@ -9,6 +9,7 @@
 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 $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 @@
 
 
 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 @@
 
 
 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 @@
 
 
 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"
Index: pspp/tests/test_template
diff -u pspp/tests/test_template:1.4 pspp/tests/test_template:1.5
--- pspp/tests/test_template:1.4        Sat Mar  4 05:01:06 2006
+++ pspp/tests/test_template    Sat Mar 11 07:16:40 2006
@@ -11,6 +11,8 @@
 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 @@
 
 
 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
 
 
Index: pspp/tests/xforms/casefile.sh
diff -u pspp/tests/xforms/casefile.sh:1.7 pspp/tests/xforms/casefile.sh:1.8
--- pspp/tests/xforms/casefile.sh:1.7   Sat Mar  4 00:28:15 2006
+++ pspp/tests/xforms/casefile.sh       Sat Mar 11 07:16:40 2006
@@ -8,6 +8,7 @@
 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 @@
 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"




reply via email to

[Prev in Thread] Current Thread [Next in Thread]