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

[pspp] / tests / language / dictionary / mrsets.at

diff --git a/tests/language/dictionary/mrsets.at b/tests/language/dictionary/mrsets.at
index 4eb021446a04163467c69abf74735130baa55426..49d9c7b215a56f68fc014df6ae0d14b38d39f529 100644 (file)
--- a/tests/language/dictionary/mrsets.at
+++ b/tests/language/dictionary/mrsets.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([MRSETS])
 
 m4_define([DEFINE_MRSETS_DATA],
@@ -57,7 +73,7 @@ mrsets.sps:29: warning: MRSETS: Variable y specified as part of multiple dichoto
 
 mrsets.sps:34: warning: MRSETS: Variable x specified as part of multiple dichotomy group $c (which has CATEGORYLABELS=COUNTEDVALUES) has no value label for its counted value.  This category will not be distinguishable in output.
 
-mrsets.sps:34: warning: MRSETS: Variables y and z specified as part of multiple dichotomy group $c (which has CATEGORYLABELS=COUNTEDVALUES) have the same value label for the the group's counted value.  These categories will not be distinguishable in output.
+mrsets.sps:34: warning: MRSETS: Variables y and z specified as part of multiple dichotomy group $c (which has CATEGORYLABELS=COUNTEDVALUES) have the same value label for the group's counted value.  These categories will not be distinguishable in output.
 
 mrsets.sps:38: warning: MRSETS: MDGROUP subcommand for group $d specifies LABELSOURCE=VARLABEL but not CATEGORYLABELS=COUNTEDVALUES.  Ignoring LABELSOURCE.
 
@@ -185,7 +201,7 @@ d
 ","Multiple category set
 "
 
-mrsets.sps:50: note: MRSETS: The active file dictionary does not contain any multiple response sets.
+mrsets.sps:50: note: MRSETS: The active dataset dictionary does not contain any multiple response sets.
 ])
 AT_CLEANUP
 
@@ -239,7 +255,7 @@ AT_DATA([mrsets.sps],
 MRSETS /MCGROUP VARIABLES=a b c.
 ])
 AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6: error: MRSETS: Required NAME specification missing from MCGROUP subcommand.
+  [mrsets.sps:6.32: error: MRSETS: Syntax error at end of command: Required MCGROUP specification missing from NAME subcommand.
 ])
 AT_CLEANUP
 
@@ -249,7 +265,7 @@ AT_DATA([mrsets.sps],
 MRSETS /MCGROUP NAME=$Mcgroup.
 ])
 AT_CHECK([pspp -O format=csv mrsets.sps], [1],
-  [mrsets.sps:6: error: MRSETS: Required VARIABLES specification missing from MCGROUP subcommand.
+  [mrsets.sps:6.30: error: MRSETS: Syntax error at end of command: Required MCGROUP specification missing from VARIABLES subcommand.
 ])
 AT_CLEANUP