Rewrite and improve formatted output routines.

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

diff --git a/tests/command/no_case_size.sh b/tests/command/no_case_size.sh
index d8e1893590fa5a96bbb8e909dacb5b4188eee0fb..3d6f2867028a18ef8803ea0fa2bf8269adab2948 100755 (executable)
--- a/tests/command/no_case_size.sh
+++ b/tests/command/no_case_size.sh
@@ -7,12 +7,17 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
@@ -21,6 +26,7 @@ cleanup()
        echo "NOT cleaning $TEMPDIR"
        return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -52,6 +58,7 @@ mkdir -p $TEMPDIR
 
 cd $TEMPDIR
 
+activity="create program"
 cat <<EOF > $TESTFILE
 GET FILE='$top_srcdir/tests/no_case_size.sav'.
 DISPLAY DICTIONARY.
@@ -61,11 +68,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B -w pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|
@@ -82,46 +90,15 @@ diff -b -B -w pspp.list - <<EOF
 |COUNT   |number of countries                        |       4|
 |        |Format: F8.2                               |        |
 +--------+-------------------------------------------+--------+
-
                             CONT     SIZE      POP    COUNT
 -------------------------------- -------- -------- --------
-Asia    
-        
-        
-        
-
-Africa  
-        
-        
-        
-
-North Am
-erica   
-        
-        
-
-South Am
-erica   
-        
-        
-
-Antarcti
-ca      
-        
-        
-
-Europe  
-        
-        
-        
-
-Australi
-a/Oceani
-a       
-        
-
-
-
+Asia                             44579000   4E+009    44.00 
+Africa                           30065000   8E+008    53.00 
+North America                    24256000   5E+008    23.00 
+South America                    17819000   3E+008    12.00 
+Antarctica                       13209000      .00      .00 
+Europe                            9938000   7E+008    46.00 
+Australia/Oceania                 7687000 31000000    14.00 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi