diff options
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/init.cfg | 8 | ||||
| -rwxr-xr-x | tests/ls/nameless-uid | 4 | ||||
| -rwxr-xr-x | tests/misc/pwd-long | 4 | ||||
| -rwxr-xr-x | tests/misc/sum-sysv | 5 | ||||
| -rw-r--r-- | tests/require-perl | 6 |
6 files changed, 12 insertions, 16 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c37cca61a..b920abafc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,7 +18,6 @@ EXTRA_DIST = \ init.sh \ lang-default \ other-fs-tmpdir \ - require-perl \ sample-test \ shell-or-perl \ $(pr_data) diff --git a/tests/init.cfg b/tests/init.cfg index 56df03364..f7615e6ab 100644 --- a/tests/init.cfg +++ b/tests/init.cfg @@ -335,6 +335,14 @@ require_dirent_d_type_() || skip_ requires d_type support } +# Skip the current test if we lack Perl. +require_perl_() +{ + : ${PERL=perl} + $PERL -e 'use warnings' > /dev/null 2>&1 \ + || skip_ 'configure did not find a usable version of Perl' +} + # Does the current (working-dir) file system support sparse files? require_sparse_support_() { diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid index 49521037e..9b8139204 100755 --- a/tests/ls/nameless-uid +++ b/tests/ls/nameless-uid @@ -16,13 +16,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -: ${srcdir=.} -. $srcdir/require-perl - . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ ls require_root_ +require_perl_ nameless_uid=`$PERL -e ' foreach my $i (1000..16*1024) { getpwuid $i or (print "$i\n"), exit } diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long index e31845796..bf088fb38 100755 --- a/tests/misc/pwd-long +++ b/tests/misc/pwd-long @@ -17,13 +17,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -: ${srcdir=.} -. $srcdir/require-perl - . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ pwd require_readable_root_ +require_perl_ ARGV_0=$0 export ARGV_0 diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv index 0e35ad319..f4d6a18ed 100755 --- a/tests/misc/sum-sysv +++ b/tests/misc/sum-sysv @@ -16,9 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -: ${srcdir=.} -. $srcdir/require-perl - # Avoid a problem when run in a UTF-8 locale. # Otherwise, Perl would try to (and fail to) interpret # each string below as a sequence of multi-byte characters. @@ -28,6 +25,8 @@ export LC_ALL . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ sum +require_perl_ + # FYI, 16843009 is floor (2^32 / 255). # aka: perl -e 'print chr(255) x 16843009' diff --git a/tests/require-perl b/tests/require-perl deleted file mode 100644 index a6d9dc9d3..000000000 --- a/tests/require-perl +++ /dev/null @@ -1,6 +0,0 @@ -: ${PERL=perl} -$PERL -e 'use warnings' > /dev/null 2>&1 || { - echo 1>&2 "$0: configure did not find a usable version of Perl," \ - "so skipping this test" - Exit 77 -} |