[src/trunk]: src/tests/modules The k_helper3 program does not need to be (and...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/988904696fd4
branches:  trunk
changeset: 778808:988904696fd4
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Apr 14 02:46:17 2012 +0000

description:
The k_helper3 program does not need to be (and shouldn't be) installed
in its own subdirectory.

diffstat:

 tests/modules/k_helper3/Makefile |  4 ++--
 tests/modules/t_modload.sh       |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 1b3c4f0cedd7 -r 988904696fd4 tests/modules/k_helper3/Makefile
--- a/tests/modules/k_helper3/Makefile  Sat Apr 14 02:15:01 2012 +0000
+++ b/tests/modules/k_helper3/Makefile  Sat Apr 14 02:46:17 2012 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.3 2012/04/13 15:02:37 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.4 2012/04/14 02:46:17 pgoyette Exp $
 
 .include <bsd.own.mk>
 
 PROG=          k_helper3
 SRCS=                  k_helper3.c
-BINDIR=                ${TESTSBASE}/modules/${PROG}
+BINDIR=                ${TESTSBASE}/modules
 
 LDADD+=                -lprop
 
diff -r 1b3c4f0cedd7 -r 988904696fd4 tests/modules/t_modload.sh
--- a/tests/modules/t_modload.sh        Sat Apr 14 02:15:01 2012 +0000
+++ b/tests/modules/t_modload.sh        Sat Apr 14 02:46:17 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_modload.sh,v 1.11 2012/04/13 07:05:32 jruoho Exp $
+# $NetBSD: t_modload.sh,v 1.12 2012/04/14 02:46:17 pgoyette Exp $
 #
 # Copyright (c) 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@
 
        # XXX: Adjust when modctl(8) fails consistently.
        #
-       $(atf_get_srcdir)/k_helper3/k_helper3 \
+       $(atf_get_srcdir)/k_helper3 \
                "%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
 
        if [ $? -eq 78 ]; then
@@ -112,7 +112,7 @@
 
        # XXX: Adjust when modctl(8) fails consistently.
        #
-       $(atf_get_srcdir)/k_helper3/k_helper3 \
+       $(atf_get_srcdir)/k_helper3 \
                "%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
 
        if [ $? -eq 78 ]; then
@@ -166,7 +166,7 @@
 
        # XXX: Adjust when modctl(8) fails consistently.
        #
-       $(atf_get_srcdir)/k_helper3/k_helper3 \
+       $(atf_get_srcdir)/k_helper3 \
                "%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
 
        if [ $? -eq 78 ]; then