X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fperl-module.at;h=eee9ac99477ee78a2dc1137a9eb491870a9467d9;hb=dc3765ea5122dfc403a39b08b8f61cc1a6c89d05;hp=2be037066c933691e2417758001a09db7e1515ef;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp

diff --git a/tests/perl-module.at b/tests/perl-module.at
index 2be037066c..eee9ac9947 100644
--- a/tests/perl-module.at
+++ b/tests/perl-module.at
@@ -5,8 +5,12 @@ dnl built (with "make") but before it has been installed.  The -I options are
 dnl equivalent to "use ExtUtils::testlib;" inside the Perl program, but it does
 dnl not need to be run with the perl-module build directory as the current
 dnl working directory.
+dnl
+dnl XXX "libtool --mode=execute" is probably better than setting
+dnl LD_LIBRARY_PATH.
 m4_define([RUN_PERL_MODULE],
   [LD_LIBRARY_PATH=$abs_top_builddir/src/.libs \
+   DYLD_LIBRARY_PATH=$abs_top_builddir/src/.libs \
    $PERL -I$abs_top_builddir/perl-module/blib/arch \
          -I$abs_top_builddir/perl-module/blib/lib])
 
@@ -56,11 +60,9 @@ DISPLAY DICTIONARY.
 SHOW WEIGHT.
 ])
 AT_CHECK([pspp -O format=csv dump-dict.sps], [0],
-  [File label:
+  [File label: My Dictionary
 
-My Dictionary
-
-Documents in the active file:
+Documents in the active dataset:
 
 These Documents
 
@@ -151,11 +153,9 @@ name,Format: A20,,2
 ,Display Alignment: Left,,
 ,Display Width: 20,,
 
-File label:
-
-This is the file label
+File label: This is the file label
 
-Documents in the active file:
+Documents in the active dataset:
 
 This is a document line
 
@@ -173,11 +173,9 @@ name,Format: A20,,2
 ,Display Alignment: Left,,
 ,Display Width: 20,,
 
-File label:
-
-This is the file label
+File label: This is the file label
 
-Documents in the active file:
+Documents in the active dataset:
 
 This is a document line
 
@@ -357,7 +355,7 @@ AT_DATA([test.pl],
        my $vl = $var->get_value_labels ();
 
        print "Value Labels:\n";
-       print "$_ => $vl->{$_}\n" for keys %$vl;
+       print "$_ => $vl->{$_}\n" for sort (keys %$vl);
     }
 
     while (my @c = $sf->get_next_case () )
@@ -372,16 +370,16 @@ AT_DATA([test.pl],
 AT_CHECK([RUN_PERL_MODULE test.pl], [0],
   [Variable 0 is "string", label is "A Short String Variable"
 Value Labels:
-3333     => threes
 1111     => ones
 2222     => twos
+3333     => threes
 Variable 1 is "longstring", label is "A Long String Variable"
 Value Labels:
 Variable 2 is "numeric", label is "A Numeric Variable"
 Value Labels:
 1 => Unity
-3 => Thripality
 2 => Duality
+3 => Thripality
 Variable 3 is "date", label is "A Date Variable"
 Value Labels:
 Variable 4 is "dollar", label is "A Dollar Variable"
@@ -483,11 +481,11 @@ numeric,A Numeric Variable,,3
 ,2,Duality,
 ,3,Thripality,
 ,Custom attributes:,,
-,size,large,
-,nationality,foreign,
 ,colour[1],blue,
 ,colour[2],pink,
 ,colour[3],violet,
+,nationality,foreign,
+,size,large,
 date,A Date Variable,,4
 ,Format: DATE11,,
 ,Measure: Scale,,
@@ -537,11 +535,11 @@ numeric,A Numeric Variable,,3
 ,2,Duality,
 ,3,Thripality,
 ,Custom attributes:,,
-,size,large,
-,nationality,foreign,
 ,colour[1],blue,
 ,colour[2],pink,
 ,colour[3],violet,
+,nationality,foreign,
+,size,large,
 date,A Date Variable,,4
 ,Format: DATE11,,
 ,Measure: Scale,,
@@ -620,7 +618,7 @@ AT_DATA([test.pl],
     print $PSPP::errstr, "\n";
 ]])
 AT_CHECK([RUN_PERL_MODULE test.pl], [0],
-  [[Error opening "no-such-file.sav" for reading as a system file: No such file or directory.
+  [[Error opening `no-such-file.sav' for reading as a system file: No such file or directory.
 ]],
   [[Name "PSPP::errstr" used only once: possible typo at test.pl line 8.
 ]])
@@ -688,7 +686,7 @@ AT_DATA([test.pl],
 
     my $attr = $var->get_attributes ();
 
-    foreach my $k (keys %$attr)
+    foreach my $k (sort (keys (%$attr)))
     {
 	my $ll = $attr->{$k};
 	print "$k =>";
@@ -696,7 +694,8 @@ AT_DATA([test.pl],
     }
 ]])
 AT_CHECK([RUN_PERL_MODULE test.pl], [0],
-  [[colour =>blue, pink, violet
+  [[$@Role =>0
+colour =>blue, pink, violet
 nationality =>foreign
 size =>large
 ]])
@@ -704,8 +703,10 @@ AT_CLEANUP
 
 AT_SETUP([Perl Pspp.t])
 AT_SKIP_IF([test "$WITH_PERL_MODULE" = no])
+# Skip this test if Perl's Text::Diff module is not installed.
+AT_CHECK([perl -MText::Diff -e '' || exit 77])
 AT_CHECK([RUN_PERL_MODULE $abs_top_builddir/perl-module/t/Pspp.t], [0],
-  [[1..36
+  [[1..37
 ok 1 - use PSPP;
 ok 2 - Dictionary Creation
 ok 3
@@ -743,15 +744,6 @@ ok 33 - Missing Value Positive
 ok 34 - Missing Value Positive SYS
 ok 35 - Missing Value Positive Num
 ok 36 - Custom Attributes
-]],
-  [[# @&t@
-# @@ -0,0 +1 @@
-# +
-# @@ -0,0 +1 @@
-# +
-# @@ -0,0 +1 @@
-# +
-# @@ -0,0 +1 @@
-# +
-]])
+ok 37 - Case count
+]],[ignore])
 AT_CLEANUP