Module Name: src
Committed By: pooka
Date: Wed Feb 16 16:02:52 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/librumpclient: Makefile h_exec.c t_exec.sh
Log Message:
no need to create a hardlinked name for the helper, just fake argv[]
To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/librumpclient/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/librumpclient/h_exec.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/librumpclient/t_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.248 src/distrib/sets/lists/tests/mi:1.249
--- src/distrib/sets/lists/tests/mi:1.248 Tue Feb 15 15:18:37 2011
+++ src/distrib/sets/lists/tests/mi Wed Feb 16 16:02:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.248 2011/02/15 15:18:37 pooka Exp $
+# $NetBSD: mi,v 1.249 2011/02/16 16:02:52 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -471,7 +471,7 @@
./usr/libdata/debug/usr/tests/lib/librt/t_sem.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/librumpclient tests-lib-debug
./usr/libdata/debug/usr/tests/lib/librumpclient/h_exec.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/librumpclient/h_ution.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/librumpclient/h_ution.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/librumpclient/t_fd.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/librumphijack tests-lib-debug
./usr/libdata/debug/usr/tests/lib/librumphijack/h_client.debug tests-lib-debug debug,atf
@@ -1902,7 +1902,7 @@
./usr/tests/lib/librumpclient tests-lib-tests atf
./usr/tests/lib/librumpclient/Atffile tests-lib-tests atf
./usr/tests/lib/librumpclient/h_exec tests-lib-tests atf
-./usr/tests/lib/librumpclient/h_ution tests-lib-tests atf
+./usr/tests/lib/librumpclient/h_ution tests-obsolete obsolete
./usr/tests/lib/librumpclient/t_exec tests-lib-tests atf
./usr/tests/lib/librumpclient/t_fd tests-lib-tests atf
./usr/tests/lib/librumphijack tests-lib-tests atf
Index: src/tests/lib/librumpclient/Makefile
diff -u src/tests/lib/librumpclient/Makefile:1.2 src/tests/lib/librumpclient/Makefile:1.3
--- src/tests/lib/librumpclient/Makefile:1.2 Tue Feb 15 15:16:46 2011
+++ src/tests/lib/librumpclient/Makefile Wed Feb 16 16:02:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/15 15:16:46 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 16:02:52 pooka Exp $
#
.include <bsd.own.mk>
@@ -10,9 +10,6 @@
TESTS_SH= t_exec
-# what do you mean I missed?
-LINKS+= ${TESTSDIR}/h_exec ${TESTSDIR}/h_ution
-
ATFFILE= yes
LDADD+= -lrumpclient
Index: src/tests/lib/librumpclient/h_exec.c
diff -u src/tests/lib/librumpclient/h_exec.c:1.4 src/tests/lib/librumpclient/h_exec.c:1.5
--- src/tests/lib/librumpclient/h_exec.c:1.4 Wed Feb 16 15:34:18 2011
+++ src/tests/lib/librumpclient/h_exec.c Wed Feb 16 16:02:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: h_exec.c,v 1.4 2011/02/16 15:34:18 pooka Exp $ */
+/* $NetBSD: h_exec.c,v 1.5 2011/02/16 16:02:52 pooka Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -51,6 +51,7 @@
int s1, s2;
char buf[12];
char *eargv[4];
+ char *ename;
extern char **environ;
if (rumpclient_init() == -1)
@@ -104,9 +105,11 @@
}
}
+ ename = __UNCONST("h_ution");
+
/* omstart! */
sprintf(buf, "%d", s2);
- eargv[0] = __UNCONST("h_ution");
+ eargv[0] = ename;
eargv[1] = __UNCONST("_didexec");
eargv[2] = buf;
eargv[3] = NULL;
Index: src/tests/lib/librumpclient/t_exec.sh
diff -u src/tests/lib/librumpclient/t_exec.sh:1.3 src/tests/lib/librumpclient/t_exec.sh:1.4
--- src/tests/lib/librumpclient/t_exec.sh:1.3 Wed Feb 16 15:34:18 2011
+++ src/tests/lib/librumpclient/t_exec.sh Wed Feb 16 16:02:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_exec.sh,v 1.3 2011/02/16 15:34:18 pooka Exp $
+# $NetBSD: t_exec.sh,v 1.4 2011/02/16 16:02:52 pooka Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,7 +62,7 @@
{
atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
- atf_check -s exit:0 $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_ution
+ atf_check -s exit:0 $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec
atf_check -s exit:0 -o save:sstat.out rump.sockstat
atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.1234' \
sed -n 2p sstat.out
@@ -86,7 +86,7 @@
atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
atf_check -s exit:0 \
- $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_ution cloexec1
+ $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec cloexec1
atf_check -s exit:0 -o save:sstat.out rump.sockstat
atf_check -s exit:0 -o inline:'2\n' sed -n '$=' sstat.out
atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.2345' \
