projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DESCRIPTIVES: Fix bad error message.
[pspp]
/
tests
/
perl-module.at
diff --git
a/tests/perl-module.at
b/tests/perl-module.at
index 58b3900cdfe1d04d4b4b57860bbf8445b2737c6e..58181c5f98715ac855ac65d6a31c1ae32c760a53 100644
(file)
--- a/
tests/perl-module.at
+++ b/
tests/perl-module.at
@@
-1,5
+1,5
@@
dnl PSPP - a program for statistical analysis.
dnl PSPP - a program for statistical analysis.
-dnl Copyright (C) 2017, 2020 Free Software Foundation, Inc.
+dnl Copyright (C) 2017, 2020
, 2021
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
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
@@
-19,11
+19,14
@@
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.
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 \
+asan_lib=$(
"$abs_top_builddir/libtool"
--mode=execute ldd \
+
"$abs_top_builddir/src/ui/terminal/pspp"
2>/dev/null \
| grep asan \
| awk '{print $3}')
| grep asan \
| awk '{print $3}')
-if test ! -e "$asan_lib"; then
+if test -e "$asan_lib"; then
+ USING_ASAN=:
+else
+ USING_ASAN=false
asan_lib=
fi
asan_lib=
fi
@@
-33,12
+36,12
@@
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.
run_perl_module () {
dnl not need to be run with the perl-module build directory as the current
dnl working directory.
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
\
+ 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" \
ASAN_OPTIONS="$ASAN_OPTIONS detect_leaks=false" \
- $PERL -I
$abs_top_builddir/perl-module/blib/arch
\
- -I
$abs_top_builddir/perl-module/blib/lib
"$@"
+ $PERL -I
"$abs_top_builddir/perl-module/blib/arch"
\
+ -I
"$abs_top_builddir/perl-module/blib/lib"
"$@"
}
m4_divert_pop([PREPARE_TESTS])
}
m4_divert_pop([PREPARE_TESTS])
@@
-479,9
+482,7
@@
A Short String Variable,1111,ones
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
Table: Variable and Dataset Attributes
Variable and Name,,Value
Table: Variable and Dataset Attributes
Variable and Name,,Value
@@
-516,9
+517,7
@@
A Short String Variable,1111,ones
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
A Numeric Variable,1,Unity
,2,Duality
,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
Table: Variable and Dataset Attributes
Variable and Name,,Value
Table: Variable and Dataset Attributes
Variable and Name,,Value
@@
-678,10
+677,8
@@
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_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])
-# 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
+AT_CHECK([run_perl_module "$abs_top_builddir/perl-module/t/Pspp.t"], [0],
+ [[1..37
ok 1 - use PSPP;
ok 2 - Dictionary Creation
ok 3
ok 1 - use PSPP;
ok 2 - Dictionary Creation
ok 3
@@
-720,6
+717,5
@@
ok 34 - Missing Value Positive SYS
ok 35 - Missing Value Positive Num
ok 36 - Custom Attributes
ok 37 - Case count
ok 35 - Missing Value Positive Num
ok 36 - Custom Attributes
ok 37 - Case count
-ok 38 - Memory management of append_case
]],[ignore])
AT_CLEANUP
]],[ignore])
AT_CLEANUP