Rewrite PSPP output engine.

[pspp-builds.git] / tests / command / sample.sh

diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index 6ba6646bc1ae3d3e202142138ee765e77d7186d5..4d001bf7ff69004775758c5d16dadad5b7606e21 100755 (executable)
--- a/tests/command/sample.sh
+++ b/tests/command/sample.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -81,19 +85,17 @@ $SUPERVISOR $PSPP --testing-mode $TEMPDIR/sample.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create head"
-grep -v '^\ *$' $TEMPDIR/pspp.list | head -2 > $TEMPDIR/head
+grep -v '^\ *$' $TEMPDIR/pspp.csv | head -1 > $TEMPDIR/head
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="extract data"
-grep  '[0-9][0-9]*' $TEMPDIR/pspp.list > $TEMPDIR/data
+grep  '[0-9][0-9]*' $TEMPDIR/pspp.csv > $TEMPDIR/data
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare head"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/head
 diff -b $TEMPDIR/head - << EOF
- A
---
+Table: Data List
 EOF
 if [ $? -ne 0 ] ; then fail ; fi