From d935b542635e02a0dcc67ec66f2912226a50f71d Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Tue, 14 Jan 2014 18:39:30 +0000 Subject: [PATCH] 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 --- bin/pax/tests/Kyuafile | 7 ------- bin/pax/tests/Makefile | 3 +-- bin/pax/tests/{legacy_test.sh => legacy_test.pl} | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 bin/pax/tests/Kyuafile rename bin/pax/tests/{legacy_test.sh => legacy_test.pl} (99%) 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 TESTSDIR= ${TESTSBASE}/bin/pax -KYUAFILE= yes -TAP_TESTS_SH= legacy_test +TAP_TESTS_PERL= legacy_test .include diff --git a/bin/pax/tests/legacy_test.sh b/bin/pax/tests/legacy_test.pl similarity index 99% rename from bin/pax/tests/legacy_test.sh rename to 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;