From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 17 May 2008 07:26:45 +0000 (+0000)
Subject: Fixed non-portable shell syntax in tests.  Added a dist-hook target to check
X-Git-Tag: v0.6.0~10
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74cfe5c070a0810cf43c0981daa53dcea3a8ee3d;p=pspp-builds.git

Fixed non-portable shell syntax in tests.  Added a dist-hook target to check
for these in the future.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index bf8f6ccb..c71798e8 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-16  John Darrington <john@darrington.wattle.id.au>
+
+	* compression.sh print-crash.sh print-strings.sh very-long-strings.sh :
+	Removed export VAR=VAL syntax.
+
+	* automake.mk:  Added test to check for non-portable shell syntax
+
 2008-04-14  Jason Stover  <jhs@math.gcsu.edu>
 
 	* automake.mk: New test for regression with QR decomposition.
diff --git a/tests/automake.mk b/tests/automake.mk
index ac9b415c..1dd78323 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -311,3 +311,8 @@ EXTRA_DIST += \
 
 CLEANFILES += *.save pspp.* foo*
 
+dist-hook:
+	@if grep -q 'export .*=' $(dist_TESTS) ; then \
+	 echo 'One or more tests contain non-portable "export VAR=val" syntax' ; \
+	 false ; \
+	fi
diff --git a/tests/bugs/compression.sh b/tests/bugs/compression.sh
index d2147237..885846ee 100755
--- a/tests/bugs/compression.sh
+++ b/tests/bugs/compression.sh
@@ -12,7 +12,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
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
diff --git a/tests/bugs/print-crash.sh b/tests/bugs/print-crash.sh
index 9c1a7677..08f9615f 100755
--- a/tests/bugs/print-crash.sh
+++ b/tests/bugs/print-crash.sh
@@ -14,7 +14,8 @@ top_builddir=`cd $top_builddir; pwd`
 
 PSPP=$top_builddir/src/ui/terminal/pspp
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
diff --git a/tests/command/print-strings.sh b/tests/command/print-strings.sh
index 114794f2..4e1d98fa 100755
--- a/tests/command/print-strings.sh
+++ b/tests/command/print-strings.sh
@@ -12,7 +12,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
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh
index d6c80420..d50abd9b 100755
--- a/tests/command/very-long-strings.sh
+++ b/tests/command/very-long-strings.sh
@@ -13,7 +13,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
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()