Merge remote-tracking branch 'origin/master' into sheet

[pspp] / tests / language / lexer / lexer.at

diff --git a/tests/language/lexer/lexer.at b/tests/language/lexer/lexer.at
index 6d3a5ad9860b0581b0305b9ba8a41fa0d5f48983..f13940bd6767d43585a4ce2887ef945b83c01bd8 100644 (file)
--- a/tests/language/lexer/lexer.at
+++ b/tests/language/lexer/lexer.at
@@ -1,3 +1,19 @@
+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([lexer])
 
 AT_SETUP([lexer ignores initial @%:@! line])
@@ -71,10 +87,13 @@ lis|.\0" > lexer.sps
 # We sort the output into a predictable order because the lexer finds
 # and reports null bytes as soon as it reads them into its input
 # buffer, as opposed to when it encounters them during tokenization.
+# This also means that null bytes might be reported as part of one
+# command or another or none, hence removing the LIST: prefix.
 AT_CHECK([pspp -O format=csv lexer.sps > lexer.csv], [1])
-AT_CHECK([sed '/^$/d' lexer.csv | sort], [0], [dnl
+AT_CHECK([sed '/^$/d
+s/LIST: //' lexer.csv | sort], [0], [dnl
 lexer.sps: error: Bad character U+0000 in input.
 lexer.sps:1: error: Unknown command `datA dist'.
-lexer.sps:2: error: LIST: LIST is allowed only after the active dataset has been defined.
+lexer.sps:2: error: LIST is allowed only after the active dataset has been defined.
 ])
 AT_CLEANUP