From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 18 Jan 2005 11:31:45 +0000 (+0000)
Subject: Fixed numerous memory leaks.  Changed many of the test cases to use a canonical
X-Git-Tag: v0.4.0~195
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a19e7749cdb8713316fde220f2fc9a5ad5dc79ed;p=pspp-builds.git

Fixed numerous memory leaks.  Changed many of the test cases to use a canonical
format for the temporary test file names.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b4e9b12c..a0a45cb0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 18 19:26:59 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+	* examine.q  factor_stats.[ch] get.c pfm-read.c: Plugged numerous
+	memory leaks.
+
 Mon Jan 10 14:43:45 WST 2005 John Darrington <john@darrington.wattle.id.au>
 
 	* ascii.c cartesian.c casefile.c chart.h devind.c 
diff --git a/src/examine.q b/src/examine.q
index 469b413c..7d5c2b2b 100644
--- a/src/examine.q
+++ b/src/examine.q
@@ -132,7 +132,7 @@ void box_plot_group(const struct factor *fctr,
 
 
 void box_plot_variables(const struct factor *fctr, 
-			struct variable **vars, int n_vars, 
+			const struct variable **vars, int n_vars, 
 			const struct variable *id
 			);
 
@@ -211,7 +211,10 @@ cmd_examine(void)
   multipass_procedure_with_splits (run_examine, &cmd);
 
   if ( totals ) 
-    free(totals);
+    free( totals );
+  
+  if ( dependent_vars ) 
+    free (dependent_vars);
 
   subc_list_double_destroy(&percentile_list);
 
@@ -485,6 +488,7 @@ xmn_custom_variables(struct cmd_examine *cmd )
   assert(n_dependent_vars);
 
   totals = xmalloc( sizeof(struct metrics) * n_dependent_vars);
+  memset ( totals, 0, sizeof(struct metrics) * n_dependent_vars);
 
   if ( lex_match(T_BY))
     {
@@ -786,8 +790,13 @@ run_examine(const struct casefile *cf, void *cmd_ )
 
   output_examine();
 
-  for ( v = 0 ; v < n_dependent_vars ; ++v ) 
-    hsh_destroy(totals[v].ordered_data);
+
+  if ( totals ) 
+    {
+      int i;
+      for ( i = 0 ; i < n_dependent_vars ; ++i ) 
+	metrics_destroy(&totals[i]);
+    }
 
 }
 
@@ -1623,7 +1632,7 @@ populate_descriptives(struct tab_table *tbl, int col, int row,
 
 void
 box_plot_variables(const struct factor *fctr, 
-		   struct variable **vars, int n_vars, 
+		   const struct variable **vars, int n_vars, 
 		   const struct variable *id)
 {
 
@@ -1687,7 +1696,7 @@ void
 box_plot_group(const struct factor *fctr, 
 	       const struct variable **vars, 
 	       int n_vars,
-	       const struct variable *id)
+	       const struct variable *id UNUSED)
 {
 
   int i;
diff --git a/src/factor_stats.c b/src/factor_stats.c
index 7c4cce00..8109a217 100644
--- a/src/factor_stats.c
+++ b/src/factor_stats.c
@@ -124,7 +124,6 @@ metrics_postcalc(struct metrics *m)
   int i;
   int j = 1;  
 
-
   moments1_calculate (m->moments, &m->n, &m->mean, &m->var, 
 		      &m->skewness, &m->kurtosis);
 
@@ -207,6 +206,7 @@ metrics_postcalc(struct metrics *m)
   m->trimmed_mean += (m->wvp[k1 + 1]->cc - tc) * m->wvp[k1 + 1]->v.f ;
   m->trimmed_mean /= 0.9 * m->n ;
 
+
 }
 
 
@@ -225,7 +225,12 @@ weighted_value_create(void)
 void 
 weighted_value_free(struct weighted_value *wv)
 {
-  struct case_node *cn = wv->case_nos;
+  struct case_node *cn ;
+
+  if ( !wv ) 
+    return ;
+
+  cn = wv->case_nos;
 
   while(cn)
     {
@@ -255,16 +260,28 @@ create_factor_statistics (int n, union value *id0, union value *id1)
   f->id[0] = *id0;
   f->id[1] = *id1;
   f->m = xmalloc( sizeof ( struct metrics ) * n ) ;
+  memset (f->m, 0, sizeof(struct metrics) * n);
+  f->n_var = n;
 
   return f;
 }
 
 
+void 
+metrics_destroy(struct metrics *m)
+{
+  hsh_destroy(m->ordered_data);
+  hsh_destroy(m->ptile_hash);
+  gsl_histogram_free(m->histogram);
+}
+
 void
 factor_statistics_free(struct factor_statistics *f)
 {
-  hsh_destroy(f->m->ordered_data);
-  gsl_histogram_free(f->m->histogram);
+
+  int i; 
+  for ( i = 0 ; i < f->n_var; ++i ) 
+       metrics_destroy(&f->m[i]);
   free(f->m) ; 
   free(f);
 }
diff --git a/src/factor_stats.h b/src/factor_stats.h
index b05d7423..259694e8 100644
--- a/src/factor_stats.h
+++ b/src/factor_stats.h
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 #include "hash.h"
 #include "val.h"
+#include <string.h>
 #include <gsl/gsl_histogram.h>
 #include "subclist.h"
 #include "percentiles.h"
@@ -85,6 +86,8 @@ struct metrics
 };
 
 
+struct metrics * metrics_create(void);
+
 void metrics_precalc(struct metrics *m);
 
 void metrics_calc(struct metrics *m, const union value *f, double weight, 
@@ -92,6 +95,9 @@ void metrics_calc(struct metrics *m, const union value *f, double weight,
 
 void metrics_postcalc(struct metrics *m);
 
+void  metrics_destroy(struct metrics *m);
+
+
 
 /* Linked list of case nos */
 struct case_node
@@ -133,6 +139,8 @@ struct factor_statistics {
   /* The an array stats for this factor, one for each dependent var */
   struct metrics *m;
 
+  /* The number of dependent variables */
+  int n_var;
 };
 
 
diff --git a/src/get.c b/src/get.c
index 8f98dea4..7fcb1f25 100644
--- a/src/get.c
+++ b/src/get.c
@@ -242,6 +242,7 @@ cmd_save (void)
     {
       procedure (save_write_case_func, t);
       save_trns_free (&t->h);
+      free(t);
       return CMD_SUCCESS;
     }
   else
@@ -549,12 +550,14 @@ cmd_export (void)
 
   procedure (export_write_case_func, proc);
   export_proc_free (proc);
+  free (proc);
 
   return CMD_SUCCESS;
 
  error:
   dict_destroy (dict);
   export_proc_free (proc);
+  free (proc);
   return CMD_FAILURE;
 }
 
@@ -1623,20 +1626,21 @@ finish_case_map (struct dictionary *d)
   for (i = 0; i < var_cnt; i++) 
     {
       struct variable *v = dict_get_var (d, i);
-      int src_fv = *(int *) var_detach_aux (v);
+      int *src_fv = (int *) var_detach_aux (v);
       size_t idx;
 
-      if (v->fv != src_fv)
+      if (v->fv != *src_fv)
         identity_map = 0;
       
       for (idx = 0; idx < v->nv; idx++)
         {
-          int src_idx = src_fv + idx;
+          int src_idx = *src_fv + idx;
           int dst_idx = v->fv + idx;
           
           assert (map->map[dst_idx] == -1);
           map->map[dst_idx] = src_idx;
         }
+      free (src_fv);
     }
 
   if (identity_map) 
diff --git a/src/pfm-read.c b/src/pfm-read.c
index d551b1c1..5b64d25d 100644
--- a/src/pfm-read.c
+++ b/src/pfm-read.c
@@ -114,6 +114,7 @@ pfm_close_reader (struct pfm_reader *r)
     msg (ME, _("%s: Closing portable file: %s."),
          handle_get_filename (r->fh), strerror (errno));
   free (r->trans);
+  free (r->widths);
   free (r);
 }
 
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 191e6470..63b1959a 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 18 19:25:24 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+	* Canonicalised (some of) the tests' temp file names to make it
+	easier to recognise valgrind ouput.
+
 Sun Jan  9 16:39:08 WST 2005 John Darrington <john@darrington.wattle.id.au>
 
 	* bugs/big-input-2.sh Made the test a bit faster
diff --git a/tests/bugs/big-input-2.sh b/tests/bugs/big-input-2.sh
index bd53c206..83452262 100755
--- a/tests/bugs/big-input-2.sh
+++ b/tests/bugs/big-input-2.sh
@@ -5,6 +5,7 @@
 
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -65,7 +66,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 printf "\n";
 
 activity="create program"
-cat > $TEMPDIR/large.sps <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST FILE='$TEMPDIR/large.dat' /S 1-2 (A) X 3 .
 
 
@@ -77,7 +78,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/large.sps > /dev/null
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE > /dev/null
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="appending to data"
@@ -89,7 +90,7 @@ done )  | head -50000 >> $TEMPDIR/large.dat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/large.sps > /dev/null
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE > /dev/null
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;
diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index 916587dc..c03852ec 100755
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -3,6 +3,8 @@
 # This program tests the aggregate procedure
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+
 
 here=`pwd`;
 
@@ -46,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="program create"
-cat > $TEMPDIR/test.sps << EOF
+cat > $TESTFILE << EOF
 
 data list notable /x y 1-2.
 begin data.
@@ -69,7 +71,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp    -o raw-ascii $TEMPDIR/test.sps  
+$SUPERVISOR $here/../src/pspp    -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="test result"
diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 01c90904..2f5acea0 100755
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -3,6 +3,8 @@
 # This program tests the autorecode command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+
 
 here=`pwd`;
 
@@ -46,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/prog.sps <<EOF
+cat > $TESTFILE <<EOF
 /* Tries AUTORECODE on some random but similar strings of characters.
 data list /x 1-5(a) y 7.
 begin data.
@@ -73,7 +75,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp    -o raw-ascii $TEMPDIR/prog.sps  
+$SUPERVISOR $here/../src/pspp    -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="test output"
diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh
index d7131f09..4820ab66 100755
--- a/tests/command/beg-data.sh
+++ b/tests/command/beg-data.sh
@@ -3,6 +3,7 @@
 # This program tests the BEGIN DATA / END DATA commands
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -46,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/prog.sps << EOF_foobar
+cat > $TESTFILE << EOF_foobar
 title 'Test BEGIN DATA ... END DATA'.
 
 data list /A B 1-2.
@@ -73,7 +74,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare data"
diff --git a/tests/command/bignum.sh b/tests/command/bignum.sh
index a6465426..24d0dd3f 100755
--- a/tests/command/bignum.sh
+++ b/tests/command/bignum.sh
@@ -3,6 +3,7 @@
 # This program tests the use of big numbers
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -114,7 +115,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="create program"
-cat > $TEMPDIR/prog.stat <<foobar
+cat > $TESTFILE <<foobar
 title 'Test use of big numbers'.
 
 *** Do the portable output.
@@ -127,7 +128,7 @@ foobar
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii prog.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # Like the above comments say ...
diff --git a/tests/command/count.sh b/tests/command/count.sh
index 7e9d7818..a792c08b 100755
--- a/tests/command/count.sh
+++ b/tests/command/count.sh
@@ -3,6 +3,7 @@
 # This program tests the count transformation
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -45,7 +46,7 @@ mkdir -p $TEMPDIR
 
 cd $TEMPDIR
 
-cat > $TEMPDIR/count.stat <<EOF
+cat > $TESTFILE <<EOF
 title 'Test COUNT transformation'.
 
 * we're going to count the 2s 4s and 1s in the data
@@ -65,7 +66,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/count.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh
index fce515c6..134c8bba 100755
--- a/tests/command/data-list.sh
+++ b/tests/command/data-list.sh
@@ -3,6 +3,7 @@
 # This program tests the DATA LIST input program.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -47,7 +48,7 @@ cd $TEMPDIR
 
 # Create command file.
 activity="create program"
-cat > $TEMPDIR/data-list.stat << EOF
+cat > $TESTFILE << EOF
 data list list ('|','X') /A B C D.
 begin data.
 1|23X45|2.03
@@ -99,7 +100,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii --testing-mode $TEMPDIR/data-list.stat # > $TEMPDIR/errs
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare output"
diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index ba65d474..760ac7d8 100755
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -3,6 +3,7 @@
 # This program tests the ERASE command.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -56,7 +57,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then no_result ; fi
 
 
 activity="create program 1"
-cat > $TEMPDIR/foo.sps <<EOF
+cat > $TESTFILE <<EOF
 set safer on
 
 erase FILE='foobar'.
@@ -70,12 +71,12 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
 
 # This command must fail
 activity="run prog 1"
-$SUPERVISOR $here/../src/pspp $TEMPDIR/foo.sps > /dev/null
+$SUPERVISOR $here/../src/pspp $TESTFILE > /dev/null
 if [ $? -eq 0 ] ; then fail ; fi
 
 
 activity="create program 2"
-cat > $TEMPDIR/foo.sps <<EOF
+cat > $TESTFILE <<EOF
 
 erase FILE='foobar'.
 
@@ -84,19 +85,11 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog 1"
-$SUPERVISOR $here/../src/pspp $TEMPDIR/foo.sps
+$SUPERVISOR $here/../src/pspp $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 # foobar should now be gone
 if [ -f $TEMPDIR/foobar ] ; then fail ; fi 
 
 
-
-
-
-
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-
 pass;
diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index 3df60f12..e4d39bdc 100755
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -3,6 +3,7 @@
 # This program tests  the EXTREME subcommand of the EXAMINE command.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -46,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list free /v1 w
 begin data.
 1  1
@@ -82,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
 
 activity="compare results"
diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh
index b7982d30..2428009a 100755
--- a/tests/command/examine-percentiles.sh
+++ b/tests/command/examine-percentiles.sh
@@ -5,6 +5,7 @@
 # a few cases
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -48,7 +49,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /x *.
 BEGIN DATA.
 2.00 
@@ -74,7 +75,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 no_result ; fi
 
 
diff --git a/tests/command/examine.sh b/tests/command/examine.sh
index 55c80a8a..6e27eeb8 100755
--- a/tests/command/examine.sh
+++ b/tests/command/examine.sh
@@ -3,6 +3,7 @@
 # This program tests  the EXAMINE command.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -46,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /quality * w * brand * .
 BEGIN DATA
 3  1  1
@@ -85,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
 
 # NOTE:  In the following data: Only the extreme values have been checked
diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index 931d0c11..ac7f5142 100755
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -3,6 +3,7 @@
 # This program tests the FILE LABEL and  DOCUMENT commands
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/filter.sh b/tests/command/filter.sh
index 1214c728..151e43f2 100755
--- a/tests/command/filter.sh
+++ b/tests/command/filter.sh
@@ -3,6 +3,7 @@
 # This program tests ....
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/flip.sh b/tests/command/flip.sh
index 269939fd..8b95ec77 100755
--- a/tests/command/flip.sh
+++ b/tests/command/flip.sh
@@ -3,6 +3,7 @@
 # This program tests the flip command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh
index 3cf262a4..9c92637d 100755
--- a/tests/command/import-export.sh
+++ b/tests/command/import-export.sh
@@ -3,6 +3,7 @@
 # This program tests the IMPORT and EXPORT commands
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -46,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/prog.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /x * y *.
 BEGIN DATA.
 1 2
@@ -66,7 +67,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/prog.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
diff --git a/tests/command/lag.sh b/tests/command/lag.sh
index 77ec38e8..c1adf609 100755
--- a/tests/command/lag.sh
+++ b/tests/command/lag.sh
@@ -3,6 +3,7 @@
 # This program tests the LAG function
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/list.sh b/tests/command/list.sh
index b73684d1..3bc92aa6 100755
--- a/tests/command/list.sh
+++ b/tests/command/list.sh
@@ -3,6 +3,7 @@
 # This program tests the LIST command.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/loop.sh b/tests/command/loop.sh
index 15f43ec7..3fc59788 100755
--- a/tests/command/loop.sh
+++ b/tests/command/loop.sh
@@ -3,6 +3,7 @@
 # This program tests the LOOP command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/oneway-missing.sh b/tests/command/oneway-missing.sh
index 76ab99ea..322c4216 100755
--- a/tests/command/oneway-missing.sh
+++ b/tests/command/oneway-missing.sh
@@ -3,6 +3,7 @@
 # This program tests that the ONEWAY anova command works OK when there is missing data
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -46,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /v1 * v2 * dep * vn *.
 BEGIN DATA
 . .  1  4
@@ -77,7 +78,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"
@@ -85,7 +86,7 @@ cp $TEMPDIR/pspp.list $TEMPDIR/pspp.list1
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /v1 * v2 * dep * vn * .
 BEGIN DATA
 4 .  1  2 
@@ -115,7 +116,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"
@@ -125,7 +126,7 @@ if [ $? -ne 0 ] ; then fail ; fi
 # Now try a missing dependent variable
 # Everything depends upon it, so it should behave as if LISTWISE were set
 activity="create program 3"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 DATA LIST LIST /v1 * v2 * dep * vn * .
 BEGIN DATA
 4 2  .  2 
@@ -155,7 +156,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 3"
-$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/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index f935343e..44cb5bcb 100755
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -4,6 +4,7 @@
 # when SPLIT FILE is active
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index e81d8032..98b242ff 100755
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -3,6 +3,7 @@
 # This program tests that the ONEWAY anova command works OK
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/permissions.sh b/tests/command/permissions.sh
index 960a04ca..f485fc00 100755
--- a/tests/command/permissions.sh
+++ b/tests/command/permissions.sh
@@ -3,6 +3,7 @@
 # This program tests the PERMISSIONS command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/print.sh b/tests/command/print.sh
index 33d47a7d..119ac572 100755
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -3,6 +3,7 @@
 # This program tests the PRINT transformation
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index 56a1bb30..277593fa 100755
--- a/tests/command/sample.sh
+++ b/tests/command/sample.sh
@@ -3,6 +3,7 @@
 # This program tests the SAMPLE function
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index 72d17cc9..7f266215 100755
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -3,6 +3,7 @@
 # This program tests the sort command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh
index 6b9a5ea3..2f2c98b4 100755
--- a/tests/command/split-file.sh
+++ b/tests/command/split-file.sh
@@ -3,6 +3,7 @@
 # This program tests the split file command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/sys-info.sh b/tests/command/sys-info.sh
index 31025a0c..ab87ddea 100755
--- a/tests/command/sys-info.sh
+++ b/tests/command/sys-info.sh
@@ -3,6 +3,7 @@
 # This program tests the SYSFILE INFO command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh
index 89f2a038..89815629 100755
--- a/tests/command/t-test-1-indep-val.sh
+++ b/tests/command/t-test-1-indep-val.sh
@@ -4,6 +4,7 @@
 # when a single value in the independent variable is given.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -47,7 +48,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /indep * dep *.
 begin data.
        1        6
@@ -79,7 +80,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 --git a/tests/command/t-test-1-sample-missing-anal.sh b/tests/command/t-test-1-sample-missing-anal.sh
index 53d463be..abfa3093 100755
--- a/tests/command/t-test-1-sample-missing-anal.sh
+++ b/tests/command/t-test-1-sample-missing-anal.sh
@@ -4,6 +4,7 @@
 # when there are per analysis missing values involved.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-1-sample-missing-list.sh b/tests/command/t-test-1-sample-missing-list.sh
index 2e2f1d01..9c0dc703 100755
--- a/tests/command/t-test-1-sample-missing-list.sh
+++ b/tests/command/t-test-1-sample-missing-list.sh
@@ -4,6 +4,7 @@
 # when there are listwise missing values involved.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh
index b440d555..7aec1233 100755
--- a/tests/command/t-test-1s.sh
+++ b/tests/command/t-test-1s.sh
@@ -3,6 +3,7 @@
 # This program tests that the T-TEST /TESTVAL command works OK
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-groups.sh b/tests/command/t-test-groups.sh
index 1173dcc2..3ceed34c 100755
--- a/tests/command/t-test-groups.sh
+++ b/tests/command/t-test-groups.sh
@@ -3,6 +3,7 @@
 # This program tests that the T-TEST /GROUPS command works
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-indep-missing-anal.sh b/tests/command/t-test-indep-missing-anal.sh
index 30dc2b7b..4bcbddde 100755
--- a/tests/command/t-test-indep-missing-anal.sh
+++ b/tests/command/t-test-indep-missing-anal.sh
@@ -4,6 +4,7 @@
 # when ANALYSIS missing values are involved
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh
index 1f122300..fa23407b 100755
--- a/tests/command/t-test-indep-missing-list.sh
+++ b/tests/command/t-test-indep-missing-list.sh
@@ -4,6 +4,7 @@
 # when LISTWISE missing values are involved
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-paired-missing-anal.sh b/tests/command/t-test-paired-missing-anal.sh
index 2829385e..793a0db1 100755
--- a/tests/command/t-test-paired-missing-anal.sh
+++ b/tests/command/t-test-paired-missing-anal.sh
@@ -4,6 +4,7 @@
 # when there is per ANALYSIS missing data involved.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-paired-missing-list.sh b/tests/command/t-test-paired-missing-list.sh
index 5158a6a1..4f649bbb 100755
--- a/tests/command/t-test-paired-missing-list.sh
+++ b/tests/command/t-test-paired-missing-list.sh
@@ -4,6 +4,7 @@
 # when there is listwise missing data involved.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 80920a6a..58f6f947 100755
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -3,6 +3,7 @@
 # This program tests that the T-TEST /PAIRS command works OK
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/tabs.sh b/tests/command/tabs.sh
index 05178199..764e747d 100755
--- a/tests/command/tabs.sh
+++ b/tests/command/tabs.sh
@@ -3,6 +3,7 @@
 # This program tests that tab characters can be used in string input
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh
index 8b84a31c..6a6ee3a4 100755
--- a/tests/command/trimmed-mean.sh
+++ b/tests/command/trimmed-mean.sh
@@ -4,6 +4,7 @@
 # where the data is weighted towards the centre
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/use.sh b/tests/command/use.sh
index 2afcc939..a685d308 100755
--- a/tests/command/use.sh
+++ b/tests/command/use.sh
@@ -3,6 +3,7 @@
 # This program tests USE, just to make sure that USE ALL is accepted silently.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index 8eb2cf92..acd9e458 100755
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -3,6 +3,7 @@
 # This program tests the WEIGHT command
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -46,7 +47,7 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/weight.stat <<EOF
+cat > $TESTFILE << EOF
 data list file='$top_srcdir/tests/weighting.data'/AVAR 1-5 BVAR 6-10.
 weight by BVAR.
 
@@ -58,7 +59,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/weight.stat
+$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"