Fixed a whole lot more memory leaks.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0e90b935da38c79ccfa73b3b5244f6d8aee0e9af..db74ea372edf48d19c830d0bc02a02b2efaf11c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 24 12:24:36 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+       * glob.c oneway.q q2c.c t-test.q vfm.c: Still *more* memory leaks 
+       fixed.
+
+
 Fri Jan 21 19:54:14 WST 2005 John Darrington <john@darrington.wattle.id.au>
 
        * linked-list.[ch] Added

diff --git a/src/glob.c b/src/glob.c
index 159c48296bade021e084902dc88934636dc88919..9cbcc0c6761602a86316f6d538b901b3248e876a 100644 (file)
--- a/src/glob.c
+++ b/src/glob.c
@@ -184,9 +184,10 @@ init_glob (int argc UNUSED, char **argv)
 void
 done_glob(void)
 {
-  dict_destroy(default_dict);
-  free(logfn);
-  done_settings();
+  cancel_transformations ();
+  dict_destroy (default_dict);
+  free (logfn);
+  done_settings ();
   ds_destroy (&tokstr);
 
   fh_done();

diff --git a/src/oneway.q b/src/oneway.q
index 84d50c1623ce156a784afc839d4aca52cf3bb194..1d2082043b33d3c61eecb2cfaa4c7efb4a06cf62 100644 (file)
--- a/src/oneway.q
+++ b/src/oneway.q
@@ -140,6 +140,7 @@ cmd_oneway(void)
 
   multipass_procedure_with_splits (run_oneway, &cmd);
 
+  free_oneway(&cmd);
 
   return CMD_SUCCESS;
 }

diff --git a/src/q2c.c b/src/q2c.c
index aaf3343c2a25e4715e1cf60cacca6c4594c40e74..1361320491b25a614fb90bc13d5a9c12e89b9aa6 100644 (file)
--- a/src/q2c.c
+++ b/src/q2c.c
@@ -2058,6 +2058,9 @@ dump_free (int persistent)
        {
          switch (sbc->type) 
            {
+            case SBC_VARLIST:
+             dump (0, "free (p->v_variables);");
+              break;
            case SBC_STRING:
              dump (0, "free (p->s_%s);", st_lower (sbc->name));
              break;

diff --git a/src/t-test.q b/src/t-test.q
index fe59334cac07c9bb2ddacca2f8edb720b4204926..4d58206d083e3f24151be5795dc09b0c94ccb45a 100644 (file)
--- a/src/t-test.q
+++ b/src/t-test.q
@@ -267,6 +267,7 @@ cmd_t_test(void)
        msg(SE, 
            _("TESTVAL, GROUPS and PAIRS subcommands are mutually exclusive.")
            );
+        free_t_test(&cmd);
        return CMD_FAILURE;
       }
   }
@@ -283,6 +284,7 @@ cmd_t_test(void)
       if (cmd.sbc_variables) 
        {
          msg(SE, _("VARIABLES subcommand is not appropriate with PAIRS"));
+          free_t_test(&cmd);
          return CMD_FAILURE;
        }
       else
@@ -320,6 +322,7 @@ cmd_t_test(void)
   else if ( !cmd.sbc_variables) 
     {
       msg(SE, _("One or more VARIABLES must be specified."));
+      free_t_test(&cmd);
       return CMD_FAILURE;
     }
 
@@ -349,6 +352,7 @@ cmd_t_test(void)
        }
     }
     
+  free_t_test(&cmd);
   return CMD_SUCCESS;
 }
 

diff --git a/src/vfm.c b/src/vfm.c
index 797167e6eabaeb91224c001429dcfcb1073627bc..0309755c2d98a5b61f6e253df6dc662559ecf3b6 100644 (file)
--- a/src/vfm.c
+++ b/src/vfm.c
@@ -661,12 +661,9 @@ cancel_transformations (void)
       free (t_trns[i]);
     }
   n_trns = f_trns = 0;
-  if (m_trns > 32)
-    {
-      free (t_trns);
-      t_trns=NULL;
-      m_trns = 0;
-    }
+  free (t_trns);
+  t_trns=NULL;
+  m_trns = 0;
 }
 \f
 /* Creates a case source with class CLASS and auxiliary data AUX

diff --git a/tests/bugs/examine-1sample.sh b/tests/bugs/examine-1sample.sh
index b988d9e2fffff7eda984cad2965b28a905ea4c2e..14206a59c5967c706b3679e4ca6622c909756fe0 100755 (executable)
--- a/tests/bugs/examine-1sample.sh
+++ b/tests/bugs/examine-1sample.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /quality * .
 BEGIN DATA
 3  
@@ -63,7 +63,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass

diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh
index 093c2cb70c02ae62b34d653777940e204e5f7bbb..73392c323299bfd2abc0188c8a7ca3a9b0a43229 100755 (executable)
--- a/tests/bugs/t-test-alpha.sh
+++ b/tests/bugs/t-test-alpha.sh
@@ -49,7 +49,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep (a1) dep1 * dep2 *.
 begin data.
 1  'a' 1 3
@@ -72,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"

diff --git a/tests/bugs/t-test-alpha2.sh b/tests/bugs/t-test-alpha2.sh
index bf74ec8e4b7a2bbc4b9a0400454960800414f12e..f1f37f8f30f42c360aa7d7045b5108d5d96ca832 100755 (executable)
--- a/tests/bugs/t-test-alpha2.sh
+++ b/tests/bugs/t-test-alpha2.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep (a1) dep1 * dep2 *.
 begin data.
 1  'a' 1 3
@@ -71,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat > /dev/null
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE > /dev/null
 #invert  v
 if [ $? -eq 0 ] ; then fail ; fi
 

diff --git a/tests/bugs/t-test-with-temp.sh b/tests/bugs/t-test-with-temp.sh
index 0c46357073654ef46c14a6c167ac3997d8f8c31b..9a775d31eb4e747b6084d986acfca62d1c351ffd 100755 (executable)
--- a/tests/bugs/t-test-with-temp.sh
+++ b/tests/bugs/t-test-with-temp.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /ind * x * .
 begin data.
 1 3.5
@@ -65,7 +65,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -73,7 +73,7 @@ cp $TEMPDIR/pspp.list $TEMPDIR/first.list
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /ind * x * .
 begin data.
 1 3.5

diff --git a/tests/bugs/val-labs-trailing-slash.sh b/tests/bugs/val-labs-trailing-slash.sh
index d2dfabd825c393039b930f23fb78b10c5e9edea7..7d316ed30dfd81b811753d511b0cfe24c1f01770 100755 (executable)
--- a/tests/bugs/val-labs-trailing-slash.sh
+++ b/tests/bugs/val-labs-trailing-slash.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /X * .
 BEGIN DATA.
 1 
@@ -67,7 +67,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass

diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index 44cb5bcba6b61be5aba6a9862f16b8740ffdb197..8f2c24cca391c54b0886d41adafd6a60ee493036 100755 (executable)
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /quality * brand * s *.
 BEGIN DATA
 3 1 1
@@ -86,7 +86,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 diff $TEMPDIR/pspp.list - << EOF

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index 98b242ffc2623a81c042250e062d8e450b308dd9..a729f68b5687eeda79e230258f99764e042127a2 100755 (executable)
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -47,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /quality * brand * .
 BEGIN DATA
 3 1
@@ -83,7 +83,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 diff $TEMPDIR/pspp.list - << EOF

diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index 7f2662158e3c88a035bc2e18afc3e2592c0badc5..44e5fd0546cb8146a3f3f7556430c67152413bfc 100755 (executable)
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -48,7 +48,7 @@ cd $TEMPDIR
 
 
 activity="generate stat program"
-cat > $TEMPDIR/sort.stat <<EOF
+cat > $TESTFILE <<EOF
 title 'Test SORT procedure'.
 
 data list file='$here/sort.data' notable /X000 to X126 1-127.
@@ -59,7 +59,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/sort.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # Now there should be some sorted data in $TEMPDIR/pspp.list

diff --git a/tests/command/t-test-1-sample-missing-anal.sh b/tests/command/t-test-1-sample-missing-anal.sh
index abfa309322e53dc0ce73e2a543b480156fdf2800..6031aee33b101ef9577537af6bb175d29d85e849 100755 (executable)
--- a/tests/command/t-test-1-sample-missing-anal.sh
+++ b/tests/command/t-test-1-sample-missing-anal.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program 1"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * x1 * x2.
 begin data.
 1 3.5 34
@@ -65,7 +65,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -74,7 +74,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * x1 * x2.
 begin data.
 1 3.5 34
@@ -91,7 +91,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 2"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare outputs"

diff --git a/tests/command/t-test-1-sample-missing-list.sh b/tests/command/t-test-1-sample-missing-list.sh
index 9c0dc703e4a75c027796e97523583922b3cb788a..986f27d5c610b8add06d372da3c49394d269b123 100755 (executable)
--- a/tests/command/t-test-1-sample-missing-list.sh
+++ b/tests/command/t-test-1-sample-missing-list.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program 1"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * x1 * x2.
 begin data.
 1 3.5 34
@@ -64,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * x1 * x2.
 begin data.
 1 3.5 34
@@ -91,7 +91,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 2"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare outputs"

diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh
index 7aec1233cd68a5027d5a14aa3414598909e52dc3..382a9b1f9922248cee2baa21908c3a9e230061a7 100755 (executable)
--- a/tests/command/t-test-1s.sh
+++ b/tests/command/t-test-1s.sh
@@ -47,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * abc *.
 begin data.
 1 3.5
@@ -64,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"

diff --git a/tests/command/t-test-groups.sh b/tests/command/t-test-groups.sh
index 3ceed34c694c9e279fe01acf4ef74a3ce2d566cf..72cf73c081ba06f9117d3e0e633c07265e21a6cf 100755 (executable)
--- a/tests/command/t-test-groups.sh
+++ b/tests/command/t-test-groups.sh
@@ -47,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep * dep1 * dep2 *.
 begin data.
 1  1.1 1 3
@@ -71,7 +71,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"

diff --git a/tests/command/t-test-indep-missing-anal.sh b/tests/command/t-test-indep-missing-anal.sh
index 4bcbddde1542682bbce0ded5a3456750d1090433..9fc71817089b8a04f4da5b5b9cb8afa81a6dc38e 100755 (executable)
--- a/tests/command/t-test-indep-missing-anal.sh
+++ b/tests/command/t-test-indep-missing-anal.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program 1"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep * dep1 * dep2 *.
 begin data.
 1  1.0 3.5 6
@@ -64,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -72,7 +72,7 @@ cp $TEMPDIR/pspp.list $TEMPDIR/ref.list
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep * dep1 * dep2.
 begin data.
 1 1.0 3.5 6
@@ -92,7 +92,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 2"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 

diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh
index fa23407b8a5cb71f6aaa9f92a1cd4e480ed8219d..8efbb4e3fc4f719e9053f28b1a006cfd1b0debf4 100755 (executable)
--- a/tests/command/t-test-indep-missing-list.sh
+++ b/tests/command/t-test-indep-missing-list.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program 1"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep * dep1 * dep2.
 begin data.
 1 1.0 3.5 6
@@ -65,7 +65,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -73,7 +73,7 @@ cp $TEMPDIR/pspp.list $TEMPDIR/ref.list
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep * dep1 * dep2 *.
 begin data.
 1 1.0 3.5 6
@@ -90,7 +90,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 2"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 

diff --git a/tests/command/t-test-paired-missing-anal.sh b/tests/command/t-test-paired-missing-anal.sh
index 793a0db16e56970cad41a8b0676735ce03b17a8c..de024ee5eceb63d355bb89d4fa8d17717837ba65 100755 (executable)
--- a/tests/command/t-test-paired-missing-anal.sh
+++ b/tests/command/t-test-paired-missing-anal.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program 1"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * a * b * c * d *.
 begin data.
 1 2.0 3.0 4.0 4.0
@@ -64,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -72,7 +72,7 @@ mv $TEMPDIR/pspp.list $TEMPDIR/ref.list
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * a * b * c * d *.
 begin data.
 1 2.0 3.0 4.0 4.0 
@@ -90,7 +90,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 2"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 

diff --git a/tests/command/t-test-paired-missing-list.sh b/tests/command/t-test-paired-missing-list.sh
index 4f649bbbc6b3f45a9aee028b9cb86b4536acf2a0..d45ed85713367fcbdc6b471f93a0dd926033307e 100755 (executable)
--- a/tests/command/t-test-paired-missing-list.sh
+++ b/tests/command/t-test-paired-missing-list.sh
@@ -48,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program 1"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * a * b * c * d *.
 begin data.
 1 2.0 3.0 4.0 4.0
@@ -64,7 +64,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -72,7 +72,7 @@ mv $TEMPDIR/pspp.list $TEMPDIR/ref.list
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * a * b * c * d *.
 begin data.
 1 2.0 3.0 4.0 4.0 
@@ -90,7 +90,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 2"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 58f6f94739f6f590ceba9b01898ea1388aad7fde..19793ebada79f843aa5a951c43ea24603ac57028 100755 (executable)
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -47,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * a * b *.
 begin data.
 1 2.0 3.0
@@ -63,7 +63,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"

diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh
index 6a6ee3a4c142f0c8c9508cae1027212a852f4d20..80097a121f547fcc10d0147fdb1448929d12991f 100755 (executable)
--- a/tests/command/trimmed-mean.sh
+++ b/tests/command/trimmed-mean.sh
@@ -49,7 +49,7 @@ cd $TEMPDIR
 
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /x * c *.
 BEGIN DATA.
 1 1
@@ -68,7 +68,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi