From b16272ba4757d89540a6b49986aad8884738fa67 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 14 Oct 2010 22:20:08 -0700
Subject: [PATCH] tests: Remove file and Makefile contents that are no longer
 necessary.

All of the tests have been converted to Autotest so this commit removes
variable assignments that are specific to the Automake TESTS-based
testsuite.
---
 tests/automake.mk   | 23 +-------------
 tests/test_template | 75 ---------------------------------------------
 2 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100755 tests/test_template

diff --git a/tests/automake.mk b/tests/automake.mk
index 95bc1765..017e573e 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,18 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
-TESTS_ENVIRONMENT += PERL='$(PERL)'
-
-# Allow locale_charset to find charset.alias before running "make install".
-TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
-
-TESTS_ENVIRONMENT += LC_ALL=C
-TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
-
-TESTS = $(dist_TESTS) $(nodist_TESTS)
-
 check_PROGRAMS += \
-	$(nodist_TESTS) \
 	tests/data/datasheet-test \
 	tests/data/inexactify \
 	tests/libpspp/abt-test \
@@ -203,8 +191,7 @@ tests_output_render_test_LDADD = \
 	$(LIBINTL)
 
 EXTRA_DIST += \
-	$(dist_TESTS) \
-	tests/coverage.sh tests/test_template \
+	tests/coverage.sh \
 	tests/data/bcd-in.expected.cmp.gz \
 	tests/data/binhex-in.expected.cmp.gz \
 	tests/data/binhex-out.expected.gz \
@@ -218,14 +205,6 @@ EXTRA_DIST += \
 
 CLEANFILES += *.save pspp.* foo*
 
-check-for-export-var-val:
-	@if grep -q 'export .*=' $(dist_TESTS) ; then \
-	 echo 'One or more tests contain non-portable "export VAR=val" syntax' ; \
-	 false ; \
-	fi
-
-DIST_HOOKS += check-for-export-var-val
-
 EXTRA_DIST += tests/OChangeLog
 
 # Autotest testsuite
diff --git a/tests/test_template b/tests/test_template
deleted file mode 100755
index 572e46e4..00000000
--- a/tests/test_template
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# This program tests ....
-
-TEMPDIR=/tmp/pspp-tst-$$
-TESTFILE=$TEMPDIR/`basename $0`.sps
-
-# ensure that top_srcdir and top_builddir  are absolute
-if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
-if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
-top_srcdir=`cd $top_srcdir; pwd`
-top_builddir=`cd $top_builddir; pwd`
-
-PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
-
-STAT_CONFIG_PATH=$top_srcdir/config
-export STAT_CONFIG_PATH
-
-LANG=C
-export LANG
-
-
-cleanup()
-{
-     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
-	echo "NOT cleaning $TEMPDIR"
-     	return ; 
-     fi
-     rm -rf $TEMPDIR
-}
-
-
-fail()
-{
-    echo $activity
-    echo FAILED
-    cleanup;
-    exit 1;
-}
-
-
-no_result()
-{
-    echo $activity
-    echo NO RESULT;
-    cleanup;
-    exit 2;
-}
-
-pass()
-{
-    cleanup;
-    exit 0;
-}
-
-mkdir -p $TEMPDIR
-
-cd $TEMPDIR
-
-put test set up here ...
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-activity="run program"
-$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
-
-put test here
-
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-pass;
-- 
2.30.2