aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJulio Merino <jmmv@FreeBSD.org>2014-01-14 18:39:30 +0000
committerJulio Merino <jmmv@FreeBSD.org>2014-01-14 18:39:30 +0000
commitd935b542635e02a0dcc67ec66f2912226a50f71d (patch)
treea4cece24f08efa6a3d4d3175131c39af1a69e255 /bin
parente8de5c5235de0a5d51515301383e6b0fccaeffe1 (diff)
downloadsrc-d935b542635e02a0dcc67ec66f2912226a50f71d.tar.gz
src-d935b542635e02a0dcc67ec66f2912226a50f71d.zip
Use TAP_TESTS_PERL to register the legacy_test in bin/pax.
Redo r260586 by using the new functionality in tap.test.mk to transparently support perl-based test programs. As a side-effect, we get rid of an explicit path to /usr/bin/perl by replacing it with /usr/local/bin/perl (or as defined in tap.test.mk). This also fixes the name of the legacy_test source file because this should have always been legacy_test.pl and not legacy_test.sh. My mistake when originally moving the code around without realizing that this was a perl script. MFC after: 5 days
Notes
Notes: svn path=/head/; revision=260634
Diffstat (limited to 'bin')
-rw-r--r--bin/pax/tests/Kyuafile7
-rw-r--r--bin/pax/tests/Makefile3
-rw-r--r--bin/pax/tests/legacy_test.pl (renamed from bin/pax/tests/legacy_test.sh)2
3 files changed, 1 insertions, 11 deletions
diff --git a/bin/pax/tests/Kyuafile b/bin/pax/tests/Kyuafile
deleted file mode 100644
index 8d0fc2e20413..000000000000
--- a/bin/pax/tests/Kyuafile
+++ /dev/null
@@ -1,7 +0,0 @@
--- $FreeBSD$
-
-syntax(2)
-
-test_suite("FreeBSD")
-
-tap_test_program{name="legacy_test", required_programs="/usr/bin/perl"}
diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile
index 4403efd0f863..f4f81eea86b3 100644
--- a/bin/pax/tests/Makefile
+++ b/bin/pax/tests/Makefile
@@ -3,8 +3,7 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/bin/pax
-KYUAFILE= yes
-TAP_TESTS_SH= legacy_test
+TAP_TESTS_PERL= legacy_test
.include <tap.test.mk>
diff --git a/bin/pax/tests/legacy_test.sh b/bin/pax/tests/legacy_test.pl
index 7c392cbb765c..dabba42b3f31 100644
--- a/bin/pax/tests/legacy_test.sh
+++ b/bin/pax/tests/legacy_test.pl
@@ -1,5 +1,3 @@
-#! /usr/bin/perl
-#
# $FreeBSD$
use strict;