X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fperl-module.at;h=69e713c4aa369decf14affd5ab4897965688c0f1;hb=543a4fc802d42256c8f7b950580343fa81370f73;hp=cbe2a0dd33175ef9aa4b30dcf00f94bb2ebfa65e;hpb=5cab4cf3322f29c0ed7134d23740e07382914f20;p=pspp diff --git a/tests/perl-module.at b/tests/perl-module.at index cbe2a0dd33..69e713c4aa 100644 --- a/tests/perl-module.at +++ b/tests/perl-module.at @@ -1,35 +1,46 @@ dnl PSPP - a program for statistical analysis. -dnl Copyright (C) 2017 Free Software Foundation, Inc. -dnl +dnl Copyright (C) 2017, 2020 Free Software Foundation, Inc. +dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation, either version 3 of the License, or dnl (at your option) any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . dnl AT_BANNER([Perl module tests]) +m4_divert_push([PREPARE_TESTS]) +# Find the Address Sanitizer library that PSPP is linked against, if any. +# If it exists, it needs to be preloaded when we run Perl. +asan_lib=$($abs_top_builddir/libtool --mode=execute ldd \ + $abs_top_builddir/src/ui/terminal/pspp 2>/dev/null \ + | grep asan \ + | awk '{print $3}') +if test ! -e "$asan_lib"; then + asan_lib= +fi + dnl This command can be used to run with the PSPP Perl module after it has been 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 \ - LD_PRELOAD=/usr/lib/i386-linux-gnu/libasan.so.4 \ - 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]) +run_perl_module () { + LD_PRELOAD=$asan_lib:$LD_PRELOAD \ + LD_LIBRARY_PATH=$abs_top_builddir/src/.libs \ + DYLD_LIBRARY_PATH=$abs_top_builddir/src/.libs \ + ASAN_OPTIONS="$ASAN_OPTIONS detect_leaks=false" \ + $PERL -I$abs_top_builddir/perl-module/blib/arch \ + -I$abs_top_builddir/perl-module/blib/lib "$@" +} +m4_divert_pop([PREPARE_TESTS]) AT_SETUP([Perl create system file]) AT_SKIP_IF([test "$WITH_PERL_MODULE" = no]) @@ -55,7 +66,7 @@ AT_DATA([test.pl], die "accept legal variable name" if !ref $var0; die if $d->get_var_cnt () != 1; - my $var1 = PSPP::Var->new ($d, "money", + my $var1 = PSPP::Var->new ($d, "money", (fmt=>PSPP::Fmt::DOLLAR, width=>4, decimals=>2) ); die "cappet valid format" if !ref $var1; @@ -68,7 +79,7 @@ AT_DATA([test.pl], $sysfile->close (); ]) -AT_CHECK([RUN_PERL_MODULE test.pl]) +AT_CHECK([run_perl_module test.pl]) AT_DATA([dump-dict.sps], [GET FILE='testfile.sav'. DISPLAY FILE LABEL. @@ -102,16 +113,16 @@ AT_DATA([test.pl], my $d = PSPP::Dict->new(); PSPP::Var->new ($d, "id", ( - fmt=>PSPP::Fmt::F, - width=>2, + fmt=>PSPP::Fmt::F, + width=>2, decimals=>0 ) ); PSPP::Var->new ($d, "name", ( - fmt=>PSPP::Fmt::A, - width=>20, + fmt=>PSPP::Fmt::A, + width=>20, ) ); @@ -140,7 +151,7 @@ AT_DATA([test.pl], # Don't close. We want to test that the destructor does that. ]]) -AT_CHECK([RUN_PERL_MODULE test.pl]) +AT_CHECK([run_perl_module test.pl]) AT_DATA([dump-dicts.sps], [GET FILE='testfile.sav'. DISPLAY DICTIONARY. @@ -197,7 +208,7 @@ AT_DATA([test.pl], my $dict = PSPP::Dict->new(); die "dictionary creation" if !ref $dict; - my $int = PSPP::Var->new ($dict, "integer", + my $int = PSPP::Var->new ($dict, "integer", (width=>8, decimals=>0) ); $int->set_label ("My Integer"); @@ -208,7 +219,7 @@ AT_DATA([test.pl], $int->add_value_label (1, "Unity"); $int->add_value_label (2, "Duality"); - my $str = PSPP::Var->new ($dict, "string", + my $str = PSPP::Var->new ($dict, "string", (fmt=>PSPP::Fmt::A, width=>8) ); @@ -218,7 +229,7 @@ AT_DATA([test.pl], $str->set_missing_values ("this", "that"); - my $longstr = PSPP::Var->new ($dict, "longstring", + my $longstr = PSPP::Var->new ($dict, "longstring", (fmt=>PSPP::Fmt::A, width=>9) ); @@ -232,7 +243,7 @@ AT_DATA([test.pl], $sysfile->close (); ]]) -AT_CHECK([RUN_PERL_MODULE test.pl], [0], [], [stderr]) +AT_CHECK([run_perl_module test.pl], [0], [], [stderr]) cat stderr AT_DATA([dump-dict.sps], [GET FILE='testfile.sav'. @@ -270,8 +281,8 @@ my $sysfile ; PSPP::Var->new ($d, "id", ( - fmt=>PSPP::Fmt::F, - width=>2, + fmt=>PSPP::Fmt::F, + width=>2, decimals=>0 ) ); @@ -282,7 +293,7 @@ my $sysfile ; my $res = $sysfile->append_case ([3]); print "Dictionary survives sysfile\n" if $res; ]]) -AT_CHECK([RUN_PERL_MODULE test.pl], [0], +AT_CHECK([run_perl_module test.pl], [0], [Dictionary survives sysfile ]) AT_CLEANUP @@ -360,7 +371,7 @@ AT_DATA([test.pl], print "\n"; } ]]) -AT_CHECK([RUN_PERL_MODULE test.pl], [0], +AT_CHECK([run_perl_module test.pl], [0], [Variable 0 is "string", label is "A Short String Variable" Value Labels: 1111 => ones @@ -438,7 +449,7 @@ AT_DATA([test.pl], $output->close (); ]]) -AT_CHECK([RUN_PERL_MODULE test.pl]) +AT_CHECK([run_perl_module test.pl]) AT_DATA([dump-dicts.sps], [GET FILE='sample.sav'. DISPLAY DICTIONARY. @@ -560,7 +571,7 @@ AT_DATA([test.pl], print "Formatted string is \"$formatted\"\n"; print "Perl representation is \"$str\"\n"; ]]) -AT_CHECK([RUN_PERL_MODULE test.pl], [0], +AT_CHECK([run_perl_module test.pl], [0], [[Formatted string is "11-SEP-2001 08:20" Perl representation is "Tue Sep 11 08:20:00 2001" ]]) @@ -578,7 +589,7 @@ AT_DATA([test.pl], die "Returns undef on opening failure" if ref $sf; print $PSPP::errstr, "\n"; ]]) -AT_CHECK([RUN_PERL_MODULE test.pl], [0], +AT_CHECK([run_perl_module test.pl], [0], [[An error occurred while opening `no-such-file.sav': No such file or directory. ]], [[Name "PSPP::errstr" used only once: possible typo at test.pl line 8. @@ -611,24 +622,24 @@ AT_DATA([test.pl], die "Missing Value Negative Num" if PSPP::value_is_missing ($val, $numericvar); - @c = $sf->get_next_case (); - @c = $sf->get_next_case (); + @c = $sf->get_next_case (); + @c = $sf->get_next_case (); $val = $c[0]; die "Missing Value Positive" if !PSPP::value_is_missing ($val, $stringvar); - @c = $sf->get_next_case (); + @c = $sf->get_next_case (); $val = $c[2]; die "Missing Value Positive SYS" if !PSPP::value_is_missing ($val, $numericvar); - @c = $sf->get_next_case (); + @c = $sf->get_next_case (); $val = $c[2]; die "Missing Value Positive Num" if !PSPP::value_is_missing ($val, $numericvar); ]]) -AT_CHECK([RUN_PERL_MODULE test.pl]) +AT_CHECK([run_perl_module test.pl]) AT_CLEANUP AT_SETUP([Perl custom attributes]) @@ -654,7 +665,7 @@ AT_DATA([test.pl], print map "$_\n", join ', ', @$ll; } ]]) -AT_CHECK([RUN_PERL_MODULE test.pl], [0], +AT_CHECK([run_perl_module test.pl], [0], [[$@Role =>0 colour =>blue, pink, violet nationality =>foreign @@ -663,11 +674,14 @@ size =>large AT_CLEANUP AT_SETUP([Perl Pspp.t]) +AT_KEYWORDS([slow]) 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..37 +# Skip this test if Perl's Memory::Usage module is not installed. +AT_CHECK([perl -MMemory::Usage -e '' || exit 77]) +AT_CHECK([run_perl_module $abs_top_builddir/perl-module/t/Pspp.t], [0], + [[1..38 ok 1 - use PSPP; ok 2 - Dictionary Creation ok 3 @@ -706,5 +720,6 @@ ok 34 - Missing Value Positive SYS ok 35 - Missing Value Positive Num ok 36 - Custom Attributes ok 37 - Case count +ok 38 - Memory management of append_case ]],[ignore]) AT_CLEANUP