[Pspp-cvs] pspp src/language/lexer/lexer.c tests/automake....

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/11/14 12:29:26

Modified files:
        src/language/lexer: lexer.c 
        tests          : automake.mk 
Added files:
        tests/bugs     : signals.sh 

Log message:
        Fixed bug which crept in with the recent lexer changes.
        Added regression test to check for this bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/lexer.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/signals.sh?cvsroot=pspp&rev=1.1

Patches:
Index: src/language/lexer/lexer.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/lexer/lexer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/language/lexer/lexer.c  11 Nov 2006 23:10:00 -0000      1.12
+++ src/language/lexer/lexer.c  14 Nov 2006 12:29:25 -0000      1.13
@@ -111,11 +111,14 @@
 void
 lex_destroy (struct lexer *lexer)
 {
+  if ( NULL != lexer ) 
+    {
   ds_destroy (&lexer->put_tokstr);
   ds_destroy (&lexer->tokstr);
   ds_destroy (&lexer->line_buffer);
 
   free (lexer);
+    }
 }
 
 

Index: tests/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/tests/automake.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/automake.mk   5 Nov 2006 05:20:53 -0000       1.15
+++ tests/automake.mk   14 Nov 2006 12:29:26 -0000      1.16
@@ -89,6 +89,7 @@
        tests/bugs/match-files-scratch.sh \
        tests/bugs/multipass.sh \
        tests/bugs/random.sh \
+       tests/bugs/signals.sh \
        tests/bugs/t-test-with-temp.sh \
        tests/bugs/t-test.sh \
        tests/bugs/t-test-alpha.sh \

Index: tests/bugs/signals.sh
===================================================================
RCS file: tests/bugs/signals.sh
diff -N tests/bugs/signals.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/bugs/signals.sh       14 Nov 2006 12:29:26 -0000      1.1
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# This program tests that signals are properly caught and handled by PSPP
+
+TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+
+# ensure that top_srcdir and top_builddir  are absolute
+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
+
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
+
+LANG=C
+export LANG
+
+
+cleanup()
+{
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR"
+       return ; 
+     fi
+     rm -rf $TEMPDIR
+
+     # Kill any remaining children of this shell
+     kill `ps h --ppid $$ | awk '{print $1}'` 2> /dev/null
+}
+
+
+fail()
+{
+    echo $activity
+    echo FAILED
+    cleanup;
+    exit 1;
+}
+
+
+no_result()
+{
+    echo $activity
+    echo NO RESULT;
+    cleanup;
+    exit 2;
+}
+
+pass()
+{
+    cleanup;
+    exit 0;
+}
+
+mkdir -p $TEMPDIR
+
+cd $TEMPDIR
+
+
+activity="run program in interactive mode"
+cat | $PSPP --testing-mode -o raw-ascii 2> $TEMPDIR/stderr1  > /dev/null & 
+thepid1=$!
+if [ $? -ne 0 ] ; then no_result ; fi
+
+activity="run program in interactive mode 2"
+cat | $PSPP --testing-mode -o raw-ascii 2> $TEMPDIR/stderr2  > /dev/null & 
+thepid2=$!
+if [ $? -ne 0 ] ; then no_result ; fi
+
+# This one is a dummy.  Despite the sleep command,  it may not be enought 
+# to ensure that the preceeding pspp has actually initialised itself.
+activity="run program in interactive mode 3"
+cat | $PSPP --testing-mode -o raw-ascii 2> /dev/null  > /dev/null & sleep 1
+thepid3=$!
+if [ $? -ne 0 ] ; then no_result ; fi
+
+activity="sending SIGINT to pspp1"
+kill -INT $thepid1
+if [ $? -ne 0 ] ; then no_result ; fi
+
+activity="sending SIGSEGV to pspp2"
+kill -SEGV $thepid2
+if [ $? -ne 0 ] ; then no_result ; fi
+
+
+# SIGINT should have caused a clean shutdown
+
+activity="checking for absence of error messages 1"
+[ ! -s $TEMPDIR/stderr1 ]  
+if [ $? -ne 0 ] ; then fail ; fi
+
+# SIGSEGV should have caused an error message
+
+activity="checking for error messages from pspp 2"
+head -8 $TEMPDIR/stderr2 > $TEMPDIR/stderr-head
+if [ $? -ne 0 ] ; then no_result ; fi
+
+activity="comparing error messages from pspp 2"
+diff $TEMPDIR/stderr-head  - << EOF
+******************************************************
+You have discovered a bug in PSPP.  Please report this
+to address@hidden  Please include this entire
+message, *plus* several lines of output just above it.
+For the best chance at having the bug fixed, also
+include the syntax file that triggered it and a sample
+of any data file used for input.
+proximate cause:     Segmentation Violation
+EOF
+if [ $? -ne 0 ] ; then fail ; fi
+
+
+pass;