aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/bmake/tests/variables
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/bmake/tests/variables')
-rw-r--r--usr.bin/bmake/tests/variables/Makefile3
-rw-r--r--usr.bin/bmake/tests/variables/modifier_M/Makefile12
-rw-r--r--usr.bin/bmake/tests/variables/modifier_t/Makefile24
-rw-r--r--usr.bin/bmake/tests/variables/opt_V/Makefile18
-rw-r--r--usr.bin/bmake/tests/variables/t0/Makefile12
5 files changed, 29 insertions, 40 deletions
diff --git a/usr.bin/bmake/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile
index 56615dfb0efe..e010718e65a4 100644
--- a/usr.bin/bmake/tests/variables/Makefile
+++ b/usr.bin/bmake/tests/variables/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables
TESTS_SUBDIRS= modifier_M modifier_t opt_V t0
diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile
index 5841047477e5..f4bd3244edbe 100644
--- a/usr.bin/bmake/tests/variables/modifier_M/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_M
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile
index b35881a4afb6..364ff1198c38 100644
--- a/usr.bin/bmake/tests/variables/modifier_t/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile
@@ -1,22 +1,20 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_t
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.status.3
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stderr.3
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= expected.stdout.3
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.status.3
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stderr.3
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= expected.stdout.3
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile
index f52507f202f4..cd9cb511bdfa 100644
--- a/usr.bin/bmake/tests/variables/opt_V/Makefile
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile
@@ -1,19 +1,17 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/opt_V
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/t0/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile
index 4b845d71db75..50a8ff7bd59f 100644
--- a/usr.bin/bmake/tests/variables/t0/Makefile
+++ b/usr.bin/bmake/tests/variables/t0/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/t0
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>