X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fui%2Fterminal%2Fmain.at;h=29fef65843bebea780e02284364c40e3079618bc;hb=1e9875fc6bd073f970e28de5ef49e82717705858;hp=1a22f7a0e85825b363dc046257e235b1d0ac556e;hpb=0586779167e0ada4328afb0300d701da31390206;p=pspp

diff --git a/tests/ui/terminal/main.at b/tests/ui/terminal/main.at
index 1a22f7a0e8..29fef65843 100644
--- a/tests/ui/terminal/main.at
+++ b/tests/ui/terminal/main.at
@@ -1,12 +1,29 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
 AT_BANNER([PSPP terminal UI])
 
 AT_SETUP([nonexistent syntax file crash])
-AT_CHECK([pspp nonexistent], [1], 
+AT_CHECK([pspp nonexistent], [1],
   [error: Opening `nonexistent': No such file or directory.
 ])
 AT_CLEANUP
 
 AT_SETUP([SIGTERM yields clean shutdown])
+AT_KEYWORDS([slow])
 AT_DATA([main.sps], [dnl
 INPUT PROGRAM.
 COMPUTE x = x + 1.
@@ -22,18 +39,36 @@ AT_CHECK([pspp main.sps & sleep 1; kill $!; wait $!], [143], [], [ignore])
 AT_CLEANUP
 
 AT_SETUP([SIGSEGV yields error report])
+
+# This test intentionally causes SIGSEGV, so make Address Sanitizer ignore it.
+ASAN_OPTIONS=$ASAN_OPTIONS:handle_segv=0; export ASAN_OPTIONS
+
 AT_CHECK([[echo 'host command=["kill -SEGV $PPID"].' | pspp -O format=csv]],
   [139], [], [stderr])
-AT_DATA([expout], [dnl
+
+cat > expout <<EOF
 ******************************************************
 You have discovered a bug in PSPP.  Please report this
-to bug-gnu-pspp@gnu.org.  Please include this entire
+to $PACKAGE_BUGREPORT.  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
+
+AT_CHECK([sed '/proximate/q' < stderr], [0], [expout])
+AT_CLEANUP
+
+
+dnl This tests for a crash which was observed with --syntax
+AT_SETUP([argument parsing])
+
+AT_DATA([main.sps], [dnl
+ECHO 'This is a test'.
+FINISH.
 ])
-AT_CHECK([sed -n '/\*\*\*/,$p
-/proximate/q' < stderr], [0], [expout])
+
+AT_CHECK([pspp --syntax=enhanced main.sps], [0], [ignore])
+
 AT_CLEANUP