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

[pspp] / tests / data / data-out.at

diff --git a/tests/data/data-out.at b/tests/data/data-out.at
index 0b8b4fee9d656fb47d6e3a8cdd9ec4d515e749ca..2ff7a2646ddcc6db99401dc6c43e03d4447049dc 100644 (file)
--- a/tests/data/data-out.at
+++ b/tests/data/data-out.at
@@ -25,7 +25,7 @@ print "END FILE.\n";
 print "END INPUT PROGRAM.\n";
 
 print "PRINT OUTFILE='output.txt'/EXPR.\n";
-for my $format qw (F COMMA DOT DOLLAR PCT E CCA CCB CCC CCD CCE N Z) {
+for my $format (qw (F COMMA DOT DOLLAR PCT E CCA CCB CCC CCD CCE N Z)) {
     for my $d (0...16) {
        my ($min_w);
        if ($format ne 'E') {
@@ -46,7 +46,7 @@ print "EXECUTE.\n";
 ]])
 AT_CHECK([$PERL num-out.pl > num-out.sps])
 AT_CHECK([pspp -O format=csv num-out.sps])
-AT_CHECK([inexactify$EXEEXT < output.txt > output.inexact])
+AT_CHECK([inexactify < output.txt > output.inexact])
 AT_CHECK([gzip -cd < $top_srcdir/tests/data/num-out.expected.cmp.gz > expout.cmp])
 AT_DATA([num-out-decmp.pl],
 [[use strict;
@@ -218,6 +218,42 @@ sub increment {
 AT_CHECK([$PERL num-out-compare.pl $PSPP_NUM_OUT_COMPARE_FLAGS expout.inexact output.inexact])
 AT_CLEANUP
 
+AT_SETUP([non-ASCII custom currency formats])
+AT_DATA([data-out.sps], [dnl
+SET CCA='«,¥,€,»'.
+SHOW CCA.
+DATA LIST LIST NOTABLE/x.
+PRINT/x (F8.2) x (CCA10.2).
+EXECUTE.
+BEGIN DATA.
+1
+-1
+1.5
+-1.5
+.75
+1.5e10
+-1.5e10
+END DATA.
+])
+AT_CHECK([pspp -O format=csv data-out.sps], [0], [dnl
+"data-out.sps:2: note: SHOW: CCA is «,¥,€,»."
+
+1.00   ¥1.00€ @&t@
+
+-1.00  «¥1.00€»
+
+1.50   ¥1.50€ @&t@
+
+-1.50  «¥1.50€»
+
+.75    ¥.75€ @&t@
+
+1.5E+010 ¥2E+010€ @&t@
+
+-2E+010«¥2E+010€»
+])
+AT_CLEANUP
+
 AT_SETUP([binary and hexadecimal output])
 AT_DATA([binhex-out.sps], [dnl
 SET ERRORS=NONE.
@@ -14009,7 +14045,7 @@ print outfile='month-out.out'/x(month40).
 execute.
 ])
 AT_CHECK([pspp -O format=csv month-out.sps], [1], [stdout])
-AT_CHECK([[sed '/^$/d' stdout | sort | uniq -c | sed 's/^[     ]*//']], [0],
+AT_CHECK([[sed '/^ *\r*$/d' stdout | sort | uniq -c | sed 's/^[         ]*//']], [0],
 [dnl
 38 error: Month number 0.000000 is not between 1 and 12.
 38 error: Month number 0.500000 is not between 1 and 12.
@@ -14925,7 +14961,7 @@ end repeat.
 execute.
 ])
 AT_CHECK([pspp -O format=csv wkday-out.sps], [1], [stdout])
-AT_CHECK([[sed '/^$/d' stdout | sort | uniq -c | sed 's/^[     ]*//']], [0],
+AT_CHECK([[sed '/^ *\r*$/d' stdout | sort | uniq -c | sed 's/^[         ]*//']], [0],
 [dnl
 39 error: Weekday number 0.000000 is not between 1 and 7.
 39 error: Weekday number 0.500000 is not between 1 and 7.