X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fcommand.at;h=562c69b1304e22d306058eb4f1b3c028ded84711;hb=refs%2Fheads%2Frust;hp=1bd6ccf2ebc1fc22d4de85bc1c1bb4621945d456;hpb=6714a2d1ded80fc850e8dd9f2a252ab0aecff7d7;p=pspp

diff --git a/tests/language/command.at b/tests/language/command.at
index 1bd6ccf2eb..562c69b130 100644
--- a/tests/language/command.at
+++ b/tests/language/command.at
@@ -1,5 +1,47 @@
+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([command parser])
 
+AT_SETUP([command parser negative tests])
+AT_DATA([command.sps], [dnl
+DATA X.
+XYZZY.
+CLOSE FILE XYZZY.
+foo.
+])
+AT_CHECK([pspp command.sps], [1], [dnl
+command.sps:1.1-1.6: error: Unknown command `DATA X'.
+    1 | DATA X.
+      | ^~~~~~
+
+command.sps:2.1-2.5: error: Unknown command `XYZZY'.
+    2 | XYZZY.
+      | ^~~~~
+
+command.sps:3.1-3.16: error: Unknown command `CLOSE FILE XYZZY'.
+    3 | CLOSE FILE XYZZY.
+      | ^~~~~~~~~~~~~~~~
+
+command.sps:4.1-4.3: error: Unknown command `foo'.
+    4 | foo.
+      | ^~~
+])
+AT_CLEANUP
+
 dnl Tests for a bug which crashed pspp when given certain invalid input.
 AT_SETUP([command parser crash bug])
 AT_DATA([command.sps], [dnl
@@ -7,12 +49,24 @@ DATA rubbish.
 EXECUTE.
 ])
 AT_CHECK([pspp -O format=csv command.sps], [1], [dnl
-command.sps:1: error: Unknown command DATA RUBBISH.
+"command.sps:1.1-1.12: error: Unknown command `DATA rubbish'.
+    1 | DATA rubbish.
+      | ^~~~~~~~~~~~"
 
-command.sps:2: error: EXECUTE: EXECUTE is allowed only after the active file has been defined.
+"command.sps:2.1-2.7: error: EXECUTE: EXECUTE is allowed only after the active dataset has been defined.
+    2 | EXECUTE.
+      | ^~~~~~~"
 ])
 AT_CLEANUP
 
+dnl Tests for a bug where FINISH or EXIT wasn't executed until the lexer
+dnl read the first token of the next command.
+dnl
+dnl (If this recurs, the test will run forever.)
+AT_SETUP([FINISH executes immediately])
+AT_CHECK([(echo "FINISH."; while echo ; do true; done) | pspp], [0], [ignore], [ignore])
+AT_CLEANUP
+
 AT_BANNER([ERASE])
 
 AT_SETUP([ERASE -- safer mode])
@@ -24,7 +78,9 @@ set safer on
 erase FILE='foobar'.
 ])
 AT_CHECK([pspp -O format=csv erase.sps], [1], [dnl
-erase.sps:3: error: ERASE: This command not allowed when the SAFER option is set.
+"erase.sps:3.1-3.5: error: ERASE: This command not allowed when the SAFER option is set.
+    3 | erase FILE='foobar'.
+      | ^~~~~"
 ])
 AT_CHECK([cat foobar], [0], [contents
 ])