summaryrefslogtreecommitdiffstats
path: root/bin/pax
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2014-01-14 18:39:30 +0000
committerjmmv <jmmv@FreeBSD.org>2014-01-14 18:39:30 +0000
commit7fc96b015280b2bc652e2f865d674a2215a23550 (patch)
treea4cece24f08efa6a3d4d3175131c39af1a69e255 /bin/pax
parent85c07dc59c590600fa0afc42ae9bb0ca501271d0 (diff)
downloadFreeBSD-src-7fc96b015280b2bc652e2f865d674a2215a23550.zip
FreeBSD-src-7fc96b015280b2bc652e2f865d674a2215a23550.tar.gz
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
Diffstat (limited to 'bin/pax')
-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 8d0fc2e..0000000
--- 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 4403efd..f4f81ee 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 7c392cb..dabba42 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;
OpenPOWER on IntegriCloud