Module Name: src
Committed By: pgoyette
Date: Sat Apr 14 02:46:17 UTC 2012
Modified Files:
src/tests/modules: t_modload.sh
src/tests/modules/k_helper3: Makefile
Log Message:
The k_helper3 program does not need to be (and shouldn't be) installed
in its own subdirectory.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/modules/t_modload.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/modules/k_helper3/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/modules/t_modload.sh
diff -u src/tests/modules/t_modload.sh:1.11 src/tests/modules/t_modload.sh:1.12
--- src/tests/modules/t_modload.sh:1.11 Fri Apr 13 07:05:32 2012
+++ src/tests/modules/t_modload.sh Sat Apr 14 02:46:17 2012
@@ -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 @@ plain_body() {
# 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 @@ iflag_body() {
# 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 @@ sflag_body() {
# 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
Index: src/tests/modules/k_helper3/Makefile
diff -u src/tests/modules/k_helper3/Makefile:1.3 src/tests/modules/k_helper3/Makefile:1.4
--- src/tests/modules/k_helper3/Makefile:1.3 Fri Apr 13 15:02:37 2012
+++ src/tests/modules/k_helper3/Makefile Sat Apr 14 02:46:17 2012
@@ -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
