X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fstats%2Faggregate.at;h=e574fc51f3e835f5441004d1599e495cd30df7c9;hb=a1610f63ae0c6de973de7d35d977c6119eec06f6;hp=da078f84d1ff298bf4355bf774c21216416ce46f;hpb=fad701f04b435a42e2feabd90174274f04a23d4d;p=pspp

diff --git a/tests/language/stats/aggregate.at b/tests/language/stats/aggregate.at
index da078f84d1..e574fc51f3 100644
--- a/tests/language/stats/aggregate.at
+++ b/tests/language/stats/aggregate.at
@@ -1,12 +1,28 @@
+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([AGGREGATE procedure])
 
 dnl CHECK_AGGREGATE(OUTFILE, SORT, MISSING)
 dnl
 dnl Checks the AGGREGATE procedure with the specified combination of:
 dnl
-dnl - OUTFILE: One of "scratch", "active", or "external" according to
+dnl - OUTFILE: One of "dataset", "active", or "external" according to
 dnl   where AGGREGATE's output should be directed.
-dnl 
+dnl
 dnl - SORT: Either "presorted" or "unsorted" according to whether
 dnl   AGGREGATE should received presorted input.
 dnl
@@ -33,11 +49,12 @@ m4_define([CHECK_AGGREGATE], [
     [DATA LIST NOTABLE FILE='aggregate.data' /G N 1-2 S 3(a) W 4.
 WEIGHT BY w.
 MISSING VALUES n(4) s('4').
+m4_if([$1], [dataset], [DATASET DECLARE aggregate.])
 m4_if([$2], [presorted], [SORT CASES BY g.])
 AGGREGATE dnl
 m4_if([$1], [active], [OUTFILE=*],
       [$1], [external], [OUTFILE='aggregate.sys'],
-      [outfile=@%:@AGGREGATE]) dnl
+      [outfile=aggregate]) dnl
 m4_if([$2], [presorted], [/PRESORTED]) dnl
 m4_if([$3], [columnwise], [/MISSING=COLUMNWISE])
 	/DOCUMENT
@@ -119,7 +136,7 @@ m4_if([$3], [columnwise], [/MISSING=COLUMNWISE])
 	/NSUM = sum(n)
 	/NSUMI = sum.(n).
 m4_if([$1], [external], [GET FILE='aggregate.sys'.],
-      [$1], [scratch], [GET FILE=@%:@AGGREGATE.])
+      [$1], [dataset], [DATASET ACTIVATE aggregate.])
 LIST.
 ])
   AT_CHECK([pspp -O format=csv aggregate.sps], [0], [stdout])
@@ -157,10 +174,10 @@ G,N,NI,NU,NUI,NFGT2,NFGT2I,SFGT2,SFGT2I,NFIN23,NFIN23I,SFIN23,SFIN23I,NFLT2,NFLT
 ])])
   AT_CLEANUP])
 
-CHECK_AGGREGATE([scratch], [presorted], [itemwise])
-CHECK_AGGREGATE([scratch], [presorted], [columnwise])
-CHECK_AGGREGATE([scratch], [unsorted], [itemwise])
-CHECK_AGGREGATE([scratch], [unsorted], [columnwise])
+CHECK_AGGREGATE([dataset], [presorted], [itemwise])
+CHECK_AGGREGATE([dataset], [presorted], [columnwise])
+CHECK_AGGREGATE([dataset], [unsorted], [itemwise])
+CHECK_AGGREGATE([dataset], [unsorted], [columnwise])
 CHECK_AGGREGATE([active], [presorted], [itemwise])
 CHECK_AGGREGATE([active], [presorted], [columnwise])
 CHECK_AGGREGATE([active], [unsorted], [itemwise])
@@ -171,7 +188,7 @@ CHECK_AGGREGATE([external], [unsorted], [itemwise])
 CHECK_AGGREGATE([external], [unsorted], [columnwise])
 
 AT_SETUP([AGGREGATE crash with MAX function])
-AT_DATA([aggregate.sps], 
+AT_DATA([aggregate.sps],
   [DATA LIST LIST /X (F8.2) Y (a25).
 
 BEGIN DATA.
@@ -191,8 +208,8 @@ Y,A25
 
 Table: Data List
 X,Y
-87.34,bar                      @&t@
-87.50,foo                      @&t@
+87.34,bar
+87.50,foo
 ])
 AT_CLEANUP
 
@@ -283,9 +300,6 @@ AGGREGATE OUTFILE=* MODE=ADDVARIABLES
 
 AT_CHECK([pspp -O format=csv dup-variables.sps], [1],
 ["dup-variables.sps:24: error: AGGREGATE: Variable name N_BREAK is not unique within the aggregate file dictionary, which contains the aggregate variables and the break variables."
-
-dup-variables.sps:24: error: Stopping syntax file processing here to avoid a cascade of dependent command failures.
 ])
 
-
-AT_CLEANUP
\ No newline at end of file
+AT_CLEANUP