Merge 'master' into 'psppsheet'.

[pspp] / tests / data / sys-file-reader.at

diff --git a/tests/data/sys-file-reader.at b/tests/data/sys-file-reader.at
index cdf6366e94fe4baaf6bf153e4a5a92a78b70cbe5..9fd8c09e19e3c17ebf72b535947c8f563e124074 100644 (file)
--- a/tests/data/sys-file-reader.at
+++ b/tests/data/sys-file-reader.at
@@ -1088,18 +1088,18 @@ DISPLAY ATTRIBUTES.
   AT_CHECK([cat pspp.csv], [0],
 [[Variable,Description,
 FirstVariable,Custom attributes:,
-,bert,123
 ,adèle[1],23
 ,adèle[2],34
+,bert,123
 SécondVariable,Custom attributes:,
 ,xyzzy,quux
 
 Table: Custom data file attributes.
 Attribute,Value
-SécondAttr[1],123
-SécondAttr[2],456
 Attr1[1],Value1
 Attr1[2],'déclaration'
+SécondAttr[1],123
+SécondAttr[2],456
 ]])
 done
 AT_CLEANUP
@@ -2354,7 +2354,7 @@ do
   AT_DATA([sys-file.sps], [GET FILE='sys-file.sav'.
 ])
   AT_CHECK([pspp -O format=csv sys-file.sps], [0], [dnl
-warning: `sys-file.sav' near offset 0xd8: Missing new-line parsing variable names at offset 14 in MRSETS record.
+warning: `sys-file.sav' near offset 0xd8: Missing new-line parsing variable names at offset 13 in MRSETS record.
 
 warning: `sys-file.sav' near offset 0xd8: MRSET $a has only 1 variables.
 ])
@@ -2986,9 +2986,9 @@ do
 GET FILE='sys-file.sav'.
 ])
   AT_CHECK([pspp -O format=csv sys-file.sps], [0], [dnl
-warning: `sys-file.sav' near offset 0xdf: Error parsing attribute value Attr1[[1]].
+warning: `sys-file.sav' near offset 0xde: Error parsing attribute value Attr1[[1]].
 
-warning: `sys-file.sav' near offset 0x102: Error parsing attribute value fred[[2]].
+warning: `sys-file.sav' near offset 0x101: Error parsing attribute value fred[[2]].
 ])
 done
 AT_CLEANUP