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

diff --git a/tests/perl-module.at b/tests/perl-module.at
index 15ed6c2dbd..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])
 
@@ -351,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 () )
@@ -366,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"
@@ -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
 ]])