X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcompression.sh;h=dadc88365a6e9386d835add4a241ae6753f54d9c;hb=fe425c89a0080e781a6fb67e36d050c74cb50c09;hp=5b7178d28a594bc6cf515c9121a9655b7ad0c601;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp

diff --git a/tests/bugs/compression.sh b/tests/bugs/compression.sh
index 5b7178d28a..dadc88365a 100755
--- a/tests/bugs/compression.sh
+++ b/tests/bugs/compression.sh
@@ -10,9 +10,10 @@ 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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
@@ -21,6 +22,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -72,20 +74,27 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 # Make sure the file really was compressed
 activity="inspect system file"
-dd if=$TEMPDIR/com.sav bs=1 skip=72 count=1 2> /dev/null | od > $TEMPDIR/file 
+dd if=$TEMPDIR/com.sav bs=1 skip=72 count=4 2> /dev/null | od > $TEMPDIR/file
 if [ $? -ne 0 ] ; then no_result ; fi
 
-activity="check compression byte"
-diff $TEMPDIR/file - <<EOF
-0000000 000001
-0000001
+activity="check compression setting"
+# Big-endian?
+diff -b $TEMPDIR/file - > /dev/null <<EOF
+0000000 000000 000001
+0000004
 EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-pass;
+if [ $? -ne 0 ] ; then pass ; fi
+# Little-endian?
+diff -b $TEMPDIR/file - > /dev/null <<EOF
+0000000 000001 000000
+0000004
+EOF
+if [ $? -ne 0 ] ; then pass ; fi
+# Otherwise error.
+cat $TEMPDIR/file
+fail