From 4de5b84b65a267771a36d17b94bc6b49e3d17822 Mon Sep 17 00:00:00 2001 From: jmmv Date: Fri, 25 Jul 2014 01:29:22 +0000 Subject: [PATCH] Fix structure of new tests (r268794) for usr.bin/units. - Make sure the tests go into the right directory. The location was wrong so they were overwriting the bin/chown tests! - Use the right naming scheme for the test program. - Remove the svn:executable property from the shell script. --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + usr.bin/units/tests/Makefile | 4 ++-- usr.bin/units/tests/{units_basics.sh => basics_test.sh} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename usr.bin/units/tests/{units_basics.sh => basics_test.sh} (100%) mode change 100755 => 100644 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b10b05c49b0e..75fde37f43ff 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4167,6 +4167,7 @@ OLD_FILES+=usr/share/aclocal/atf-c.m4 OLD_FILES+=usr/share/aclocal/atf-common.m4 OLD_FILES+=usr/share/aclocal/atf-sh.m4 OLD_DIRS+=usr/share/aclocal +OLD_FILES+=usr/tests/bin/chown/units_basics OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test diff --git a/usr.bin/units/tests/Makefile b/usr.bin/units/tests/Makefile index 887af6cc0fa8..0694effd12a8 100644 --- a/usr.bin/units/tests/Makefile +++ b/usr.bin/units/tests/Makefile @@ -2,8 +2,8 @@ .include -TESTSDIR= ${TESTSBASE}/bin/chown +TESTSDIR= ${TESTSBASE}/usr.bin/units -TAP_TESTS_SH= units_basics +TAP_TESTS_SH= basics_test .include diff --git a/usr.bin/units/tests/units_basics.sh b/usr.bin/units/tests/basics_test.sh old mode 100755 new mode 100644 similarity index 100% rename from usr.bin/units/tests/units_basics.sh rename to usr.bin/units/tests/basics_test.sh