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 bf8f6ccb44bc3f9fe09869d62c3b4633ae5e9d65..c71798e80c3171e4a8c59182faf66393d004868b 100644 (file)
--- 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 ac9b415cce508a8b1a055831739c256a94deb8fe..1dd783238fe6011ff710c5c2460e29217640a606 100644 (file)
--- 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 d2147237e2d8cb8ee1e1669c2ebf212facf766db..885846eebbc98d936620f439eec74d6d298820c5 100755 (executable)
--- 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 9c1a7677f99f2e078951e5ae533b3061a4f6b51b..08f9615f995ef5db0072e1f9d9386430578f6222 100755 (executable)
--- 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 114794f278654d4da43da71a03d39aa6e519fc02..4e1d98fa9e1852d898eef0b80d62ab7fefb0a58a 100755 (executable)
--- 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 d6c8042047414457e6c300a67144a8087839ebb1..d50abd9b98cff58e48f5f11f748bef2b73ee0b9d 100755 (executable)
--- 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()