X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdictionary%2Fmissing-values.at;fp=tests%2Flanguage%2Fdictionary%2Fmissing-values.at;h=214fc3f0fa50938c16c47475342ea3f25a7f4398;hb=649c202d57d7d5d8bb87be5b72839cd56ca4ca0b;hp=84ee1725296e4a2d3db1f7d795958821a6d5cec9;hpb=93ec42221da8b677420bf11435e0d24d0503601b;p=pspp

diff --git a/tests/language/dictionary/missing-values.at b/tests/language/dictionary/missing-values.at
index 84ee172529..214fc3f0fa 100644
--- a/tests/language/dictionary/missing-values.at
+++ b/tests/language/dictionary/missing-values.at
@@ -62,103 +62,67 @@ MISSING VALUES ALL ().
 DISPLAY DICTIONARY
 ])
 AT_CHECK([pspp -o pspp.csv missing-values.sps])
-AT_CHECK([sed -n '/Format/s/,.*/:/p
-s/"//g
-s/^,Missing Values: \([[^,]]*\),.*/\1/p
-/^$/p' pspp.csv
+AT_CHECK([sed -n '/^$/p; /^@<:@^"@:>@*"@<:@^"@:>@*$/N; s/^\(@<:@a-z0-9@:>@*\),".*Missing Values: \(.*\)",@<:@0-9@:>@*$/\1: \2/p; s/^\(@<:@a-z0-9@:>@*\),Format: @<:@A-Z0-9.@:>@*,@<:@0-9@:>@*$/\1: none/p' pspp.csv
 ], [0], [dnl
-date1:
-1
-num1:
-1
-
-date1:
-1; 2
-num1:
-1; 2
-
-date1:
-1; 2; 3
-num1:
-1; 2; 3
-
-date1:
-9999998; 9999984; 3
-num1:
-9999998; 9999984; 3
-
-date1:
-1
-num1:
-1
-
-date1:
-1; 2
-num1:
-1; 2
-
-date1:
-1; 2; 3
-num1:
-1; 2; 3
-
-date1:
-13342665600
-num1:
-13342665600
-
-date1:
-13342665600; 12495427200
-num1:
-13342665600; 12495427200
-
-date1:
-13342665600; 12495427200; 12570336000
-num1:
-13342665600; 12495427200; 12570336000
-
-num1:
-1 THRU 2
-
-num1:
-LOWEST THRU 2
-
-num1:
-LOWEST THRU 2
-
-num1:
-1 THRU HIGHEST
-
-num1:
-1 THRU HIGHEST
-
-num1:
-1 THRU 2; 3
-
-num1:
-LOWEST THRU 2; 3
-
-num1:
-LOWEST THRU 2; 3
-
-num1:
-1 THRU HIGHEST; -1
-
-num1:
-1 THRU HIGHEST; -1
-
-str1:
-abc  ; def  @&t@
-str2:
-abc; def
-longstr:
-abc     ; def     @&t@
-
-str1:
-str2:
-date1:
-num1:
-longstr:
+date1: 1
+num1: 1
+
+date1: 1; 2
+num1: 1; 2
+
+date1: 1; 2; 3
+num1: 1; 2; 3
+
+date1: 9999998; 9999984; 3
+num1: 9999998; 9999984; 3
+
+date1: 1
+num1: 1
+
+date1: 1; 2
+num1: 1; 2
+
+date1: 1; 2; 3
+num1: 1; 2; 3
+
+date1: 13342665600
+num1: 13342665600
+
+date1: 13342665600; 12495427200
+num1: 13342665600; 12495427200
+
+date1: 13342665600; 12495427200; 12570336000
+num1: 13342665600; 12495427200; 12570336000
+
+num1: 1 THRU 2
+
+num1: LOWEST THRU 2
+
+num1: LOWEST THRU 2
+
+num1: 1 THRU HIGHEST
+
+num1: 1 THRU HIGHEST
+
+num1: 1 THRU 2; 3
+
+num1: LOWEST THRU 2; 3
+
+num1: LOWEST THRU 2; 3
+
+num1: 1 THRU HIGHEST; -1
+
+num1: 1 THRU HIGHEST; -1
+
+str1: ""abc  ""; ""def  ""
+str2: ""abc""; ""def""
+longstr: ""abc     ""; ""def     ""
+
+str1: none
+str2: none
+date1: none
+num1: none
+longstr: none
 ])
 AT_CLEANUP