X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fperl-module.at;h=81fca4a5910e8ddde4bc78918b78a18f8f854f23;hb=e0d27941839de65b98f3b9ec982e225c88cf661e;hp=308dd7711b219a317b0f09f0470fe523f10dc9f2;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp

diff --git a/tests/perl-module.at b/tests/perl-module.at
index 308dd7711b..81fca4a591 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])
 
@@ -477,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,,
@@ -531,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,,
@@ -682,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 =>";
@@ -690,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
 ]])
@@ -701,7 +706,7 @@ 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
@@ -739,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