diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/cat/tests/Makefile | 16 | ||||
| -rw-r--r-- | bin/date/tests/Makefile | 2 | ||||
| -rw-r--r-- | bin/expr/tests/Makefile | 6 | ||||
| -rw-r--r-- | bin/ls/tests/Makefile | 2 | ||||
| -rw-r--r-- | bin/mv/tests/Makefile | 2 | ||||
| -rw-r--r-- | bin/pax/tests/Makefile | 2 | ||||
| -rw-r--r-- | bin/pkill/tests/Makefile | 2 | ||||
| -rw-r--r-- | bin/sh/tests/Makefile | 4 | ||||
| -rw-r--r-- | bin/sleep/tests/Makefile | 7 | ||||
| -rw-r--r-- | bin/test/tests/Makefile | 2 | ||||
| -rw-r--r-- | bin/tests/Makefile | 4 |
11 files changed, 11 insertions, 38 deletions
diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile index 73f82e1..8ac1ffb 100644 --- a/bin/cat/tests/Makefile +++ b/bin/cat/tests/Makefile @@ -1,18 +1,20 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR}/../../.. -SRCTOP= ${.CURDIR}/../../.. -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/bin/cat - -TESTSDIR= ${TESTSBASE}/bin/cat - NETBSD_ATF_TESTS_SH= cat_test FILESDIR= ${TESTSDIR} -FILES= d_align.in +FILES+= d_align.in FILES+= d_align.out +FILES+= d_se_output.in +FILES+= d_se_output.out .include <netbsd-tests.test.mk> +d_align.out: ${TESTSRC}/d_align.out + sed -E -e 's,^[[:space:]]{7}\$$$$,\$$,' < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= d_align.out d_align.out.tmp + .include <bsd.test.mk> diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile index d023195..ecce803 100644 --- a/bin/date/tests/Makefile +++ b/bin/date/tests/Makefile @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/date - ATF_TESTS_SH= format_string_test .include <bsd.test.mk> diff --git a/bin/expr/tests/Makefile b/bin/expr/tests/Makefile index 80c130c..21b0e99 100644 --- a/bin/expr/tests/Makefile +++ b/bin/expr/tests/Makefile @@ -1,11 +1,5 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR}/../../.. -SRCTOP= ${.CURDIR}/../../.. -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/bin/expr - -TESTSDIR= ${TESTSBASE}/bin/expr - NETBSD_ATF_TESTS_SH= expr_test ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g' diff --git a/bin/ls/tests/Makefile b/bin/ls/tests/Makefile index ba8038c..89a2e8c 100644 --- a/bin/ls/tests/Makefile +++ b/bin/ls/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/bin/ls - ATF_TESTS_SH+= ls_tests # This seems like overkill, but the idea in mind is that all of the testcases # should be runnable as !root diff --git a/bin/mv/tests/Makefile b/bin/mv/tests/Makefile index 3d437ef..229d96e 100644 --- a/bin/mv/tests/Makefile +++ b/bin/mv/tests/Makefile @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/mv - TAP_TESTS_SH= legacy_test .include <bsd.test.mk> diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile index 1f27c18..8334fea 100644 --- a/bin/pax/tests/Makefile +++ b/bin/pax/tests/Makefile @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/pax - TAP_TESTS_PERL= legacy_test .include <bsd.test.mk> diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile index a4a2c91..be46707 100644 --- a/bin/pkill/tests/Makefile +++ b/bin/pkill/tests/Makefile @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/pkill - TAP_TESTS_SH= pgrep-F_test TAP_TESTS_SH+= pgrep-LF_test TAP_TESTS_SH+= pgrep-P_test diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile index d10156c..d93e19a 100644 --- a/bin/sh/tests/Makefile +++ b/bin/sh/tests/Makefile @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/sh - TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution @@ -12,6 +10,4 @@ TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e -SUBDIR_PARALLEL= - .include <bsd.test.mk> diff --git a/bin/sleep/tests/Makefile b/bin/sleep/tests/Makefile index 9b286e6..6fc95f3 100644 --- a/bin/sleep/tests/Makefile +++ b/bin/sleep/tests/Makefile @@ -1,12 +1,7 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/bin/sleep -.PATH: ${TESTSRC} - .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/sleep -ATF_TESTS_SH= sleep_test -ATF_TESTS_SH_SRC_sleep_test= t_sleep.sh +NETBSD_ATF_TESTS_SH= sleep_test .include <bsd.test.mk> diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile index 5ee337a..a1a5d4f 100644 --- a/bin/test/tests/Makefile +++ b/bin/test/tests/Makefile @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/test - TAP_TESTS_SH= legacy_test # Some tests in here are silently not run when the tests are executed as # root. Explicitly tell Kyua to drop privileges. diff --git a/bin/tests/Makefile b/bin/tests/Makefile index 7a59b10..a0e63e5 100644 --- a/bin/tests/Makefile +++ b/bin/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> |
