CVS commit: src/tests/sys/crypto
Module Name:src
Committed By: riastradh
Date: Mon Aug 17 16:26:02 UTC 2020
Modified Files:
src/tests/sys/crypto/aes: Makefile t_aes.c
src/tests/sys/crypto/chacha: Makefile t_chacha.c
Log Message:
Make the AES and ChaCha NEON tests work in softfloat userland.
(`Softfloat' here refers to the ABI, which of course may be running
on a CPU with NEON.)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/sys/crypto/aes/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/sys/crypto/aes/t_aes.c
cvs rdiff -u -r1.4 -r1.5 src/tests/sys/crypto/chacha/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/sys/crypto/chacha/t_chacha.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/crypto/aes/Makefile
diff -u src/tests/sys/crypto/aes/Makefile:1.4 src/tests/sys/crypto/aes/Makefile:1.5
--- src/tests/sys/crypto/aes/Makefile:1.4 Sun Aug 16 15:52:14 2020
+++ src/tests/sys/crypto/aes/Makefile Mon Aug 17 16:26:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/08/16 15:52:14 martin Exp $
+# $NetBSD: Makefile,v 1.5 2020/08/17 16:26:02 riastradh Exp $
.include
@@ -19,7 +19,7 @@ SRCS.t_aes+= aes_ct_dec.c
SRCS.t_aes+= aes_ct_enc.c
SRCS.t_aes+= aes_selftest.c
-.if !empty(MACHINE_ARCH:Mearmv7hf*) || !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Mearmv7*) || !empty(MACHINE_ARCH:Maarch64*)
.PATH: ${NETBSDSRCDIR}/sys/crypto/aes/arch/arm
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/crypto/aes/arch/arm
@@ -32,10 +32,16 @@ SRCS.t_aes+= aes_armv8_64.S
SRCS.t_aes+= aes_neon.c
SRCS.t_aes+= aes_neon_impl.c
SRCS.t_aes+= aes_neon_subr.c
-.if !empty(MACHINE_ARCH:Mearmv7hf*)
+.if !empty(MACHINE_ARCH:Mearmv7*)
SRCS.t_aes+= aes_neon_32.S
.endif
+.if !empty(MACHINE_ARCH:Mearmv7*) && empty(MACHINE_ARCH:Mearmv7hf*)
+COPTS.aes_neon.c+= -mfloat-abi=softfp -mfpu=neon
+COPTS.aes_neon_subr.c+= -mfloat-abi=softfp -mfpu=neon
+AOPTS.aes_neon_32.S+= -D__SOFTFP__
+.endif
+
.endif# earmv7/aarch64
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
Index: src/tests/sys/crypto/aes/t_aes.c
diff -u src/tests/sys/crypto/aes/t_aes.c:1.3 src/tests/sys/crypto/aes/t_aes.c:1.4
--- src/tests/sys/crypto/aes/t_aes.c:1.3 Sun Jul 26 14:01:14 2020
+++ src/tests/sys/crypto/aes/t_aes.c Mon Aug 17 16:26:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_aes.c,v 1.3 2020/07/26 14:01:14 riastradh Exp $ */
+/* $NetBSD: t_aes.c,v 1.4 2020/08/17 16:26:02 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include
#endif
-#ifdef __ARM_NEON
+#if __ARM_ARCH >= 7
#include
#endif
@@ -93,7 +93,7 @@ ATF_TC_BODY(name, tc) \
AES_SELFTEST(aes_armv8_selftest, &aes_armv8_impl, "ARMv8.0-AES self-test")
#endif
-#ifdef __ARM_NEON
+#if __ARM_ARCH >= 7
AES_SELFTEST(aes_neon_selftest, &aes_neon_impl, "ARM NEON vpaes self-test")
#endif
@@ -118,7 +118,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, aes_armv8_selftest);
#endif
-#ifdef __ARM_NEON
+#if __ARM_ARCH >= 7
ATF_TP_ADD_TC(tp, aes_neon_selftest);
#endif
Index: src/tests/sys/crypto/chacha/Makefile
diff -u src/tests/sys/crypto/chacha/Makefile:1.4 src/tests/sys/crypto/chacha/Makefile:1.5
--- src/tests/sys/crypto/chacha/Makefile:1.4 Sun Aug 16 15:52:14 2020
+++ src/tests/sys/crypto/chacha/Makefile Mon Aug 17 16:26:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/08/16 15:52:14 martin Exp $
+# $NetBSD: Makefile,v 1.5 2020/08/17 16:26:02 riastradh Exp $
.include
@@ -16,19 +16,24 @@ SRCS.t_chacha+= t_chacha.c
SRCS.t_chacha+= chacha_ref.c
SRCS.t_chacha+= chacha_selftest.c
-.if !empty(MACHINE_ARCH:Mearmv7hf*) || !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Mearmv7*) || !empty(MACHINE_ARCH:Maarch64*)
.PATH: ${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm
SRCS.t_chacha+= chacha_neon.c
-.if !empty(MACHINE_ARCH:Mearmv7hf*)
+.if !empty(MACHINE_ARCH:Mearmv7*)
SRCS.t_chacha+= chacha_neon_32.S
.elif !empty(MACHINE_ARCH:Maarch64*)
SRCS.t_chacha+= chacha_neon_64.S
.endif
SRCS.t_chacha+= chacha_neon_impl.c
+.if !empty(MACHINE_ARCH:Mearmv7*) && empty(MACHINE_ARCH:Mearmv7hf*)
+COPTS.chacha_neon.c+= -mfloat-abi=softfp -mfpu=neon
+AOPTS.chacha_neon_32.S+= -D__SOFTFP__
+.endif
+
.endif# earmv7 or aarch64
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
Index: src/tests/sys/crypto/chacha/t_chacha.c
diff -u src/tests/sys/crypto/chacha/t_chacha.c:1.3 src/tests/sys/crypto/chacha/t_chacha.c:1.4
--- src/tests/sys/crypto/chacha/t_chacha.c:1.3 Mon Jul 27 20:59:53 2020
+++ src/tests/sys/crypto/chacha/t_chacha.c Mon Aug 17 16:26:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_chacha.c,v 1.3 2020/07/27 20:59:53 riastradh Exp $ */
+/* $NetBSD: t_chacha.c,v 1.4 2020/08/17 16:26:02 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#endif
-#ifdef __ARM_NEON
+#if __ARM_ARCH >= 7
#inclu
CVS commit: src/tests/sys/crypto
Module Name:src
Committed By: martin
Date: Sun Aug 16 15:52:14 UTC 2020
Modified Files:
src/tests/sys/crypto/aes: Makefile
src/tests/sys/crypto/chacha: Makefile
Log Message:
Restrict the NEON code to v7hf - the softfloat toolchain does not like
it (nor is it likely to work if there is no FPU present).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/sys/crypto/aes/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/sys/crypto/chacha/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/sys/crypto/aes/Makefile
diff -u src/tests/sys/crypto/aes/Makefile:1.3 src/tests/sys/crypto/aes/Makefile:1.4
--- src/tests/sys/crypto/aes/Makefile:1.3 Sat Jul 25 22:33:04 2020
+++ src/tests/sys/crypto/aes/Makefile Sun Aug 16 15:52:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/25 22:33:04 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2020/08/16 15:52:14 martin Exp $
.include
@@ -19,7 +19,7 @@ SRCS.t_aes+= aes_ct_dec.c
SRCS.t_aes+= aes_ct_enc.c
SRCS.t_aes+= aes_selftest.c
-.if !empty(MACHINE_ARCH:Mearmv7*) || !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*) || !empty(MACHINE_ARCH:Maarch64*)
.PATH: ${NETBSDSRCDIR}/sys/crypto/aes/arch/arm
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/crypto/aes/arch/arm
@@ -32,7 +32,7 @@ SRCS.t_aes+= aes_armv8_64.S
SRCS.t_aes+= aes_neon.c
SRCS.t_aes+= aes_neon_impl.c
SRCS.t_aes+= aes_neon_subr.c
-.if !empty(MACHINE_ARCH:Mearmv7*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*)
SRCS.t_aes+= aes_neon_32.S
.endif
Index: src/tests/sys/crypto/chacha/Makefile
diff -u src/tests/sys/crypto/chacha/Makefile:1.3 src/tests/sys/crypto/chacha/Makefile:1.4
--- src/tests/sys/crypto/chacha/Makefile:1.3 Tue Jul 28 20:08:48 2020
+++ src/tests/sys/crypto/chacha/Makefile Sun Aug 16 15:52:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/28 20:08:48 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2020/08/16 15:52:14 martin Exp $
.include
@@ -16,13 +16,13 @@ SRCS.t_chacha+= t_chacha.c
SRCS.t_chacha+= chacha_ref.c
SRCS.t_chacha+= chacha_selftest.c
-.if !empty(MACHINE_ARCH:Mearmv7*) || !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*) || !empty(MACHINE_ARCH:Maarch64*)
.PATH: ${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/crypto/chacha/arch/arm
SRCS.t_chacha+= chacha_neon.c
-.if !empty(MACHINE_ARCH:Mearmv7*)
+.if !empty(MACHINE_ARCH:Mearmv7hf*)
SRCS.t_chacha+= chacha_neon_32.S
.elif !empty(MACHINE_ARCH:Maarch64*)
SRCS.t_chacha+= chacha_neon_64.S
CVS commit: src/tests/sys/crypto/chacha
Module Name:src
Committed By: riastradh
Date: Mon Jul 27 20:59:53 UTC 2020
Modified Files:
src/tests/sys/crypto/chacha: t_chacha.c
Log Message:
It's __ARM_NEON, not __ARM_NEON__, sometimes, apparently.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/sys/crypto/chacha/t_chacha.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/crypto/chacha/t_chacha.c
diff -u src/tests/sys/crypto/chacha/t_chacha.c:1.2 src/tests/sys/crypto/chacha/t_chacha.c:1.3
--- src/tests/sys/crypto/chacha/t_chacha.c:1.2 Mon Jul 27 20:51:29 2020
+++ src/tests/sys/crypto/chacha/t_chacha.c Mon Jul 27 20:59:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_chacha.c,v 1.2 2020/07/27 20:51:29 riastradh Exp $ */
+/* $NetBSD: t_chacha.c,v 1.3 2020/07/27 20:59:53 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#endif
-#ifdef __ARM_NEON__
+#ifdef __ARM_NEON
#include
#endif
@@ -81,7 +81,7 @@ ATF_TC_BODY(name, tc) \
atf_tc_fail("%s self-test failed", (impl)->ci_name); \
}
-#ifdef __ARM_NEON__
+#ifdef __ARM_NEON
CHACHA_SELFTEST(chacha_neon_selftest, &chacha_neon_impl,
"ARM NEON ChaCha self-test")
#endif
@@ -96,7 +96,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, chacha_ref_selftest);
-#ifdef __ARM_NEON__
+#ifdef __ARM_NEON
ATF_TP_ADD_TC(tp, chacha_neon_selftest);
#endif
CVS commit: src/tests/sys/crypto/aes
Module Name:src Committed By: riastradh Date: Sun Jul 26 14:01:14 UTC 2020 Modified Files: src/tests/sys/crypto/aes: t_aes.c Log Message: Sort includes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/sys/crypto/aes/t_aes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/sys/crypto/aes/t_aes.c diff -u src/tests/sys/crypto/aes/t_aes.c:1.2 src/tests/sys/crypto/aes/t_aes.c:1.3 --- src/tests/sys/crypto/aes/t_aes.c:1.2 Sun Jul 26 12:43:27 2020 +++ src/tests/sys/crypto/aes/t_aes.c Sun Jul 26 14:01:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: t_aes.c,v 1.2 2020/07/26 12:43:27 martin Exp $ */ +/* $NetBSD: t_aes.c,v 1.3 2020/07/26 14:01:14 riastradh Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -29,8 +29,8 @@ #include #include -#include #include +#include #if defined(__i386__) || defined(__x86_64__) #include
CVS commit: src/tests/sys/crypto/aes
Module Name:src Committed By: martin Date: Sun Jul 26 12:43:27 UTC 2020 Modified Files: src/tests/sys/crypto/aes: t_aes.c Log Message: Add missing include to fix the build on architectures w/o any special accelerated AES implementation. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/sys/crypto/aes/t_aes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/sys/crypto/aes/t_aes.c diff -u src/tests/sys/crypto/aes/t_aes.c:1.1 src/tests/sys/crypto/aes/t_aes.c:1.2 --- src/tests/sys/crypto/aes/t_aes.c:1.1 Tue Jun 30 20:32:11 2020 +++ src/tests/sys/crypto/aes/t_aes.c Sun Jul 26 12:43:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: t_aes.c,v 1.1 2020/06/30 20:32:11 riastradh Exp $ */ +/* $NetBSD: t_aes.c,v 1.2 2020/07/26 12:43:27 martin Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -29,6 +29,7 @@ #include #include +#include #include #if defined(__i386__) || defined(__x86_64__)
CVS commit: src/tests/sys/crypto/aes
Module Name:src Committed By: riastradh Date: Wed Jul 1 09:58:29 UTC 2020 Modified Files: src/tests/sys/crypto/aes: Makefile Log Message: Pass the requisite -msse options for i386. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/sys/crypto/aes/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/sys/crypto/aes/Makefile diff -u src/tests/sys/crypto/aes/Makefile:1.1 src/tests/sys/crypto/aes/Makefile:1.2 --- src/tests/sys/crypto/aes/Makefile:1.1 Tue Jun 30 20:32:11 2020 +++ src/tests/sys/crypto/aes/Makefile Wed Jul 1 09:58:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2020/06/30 20:32:11 riastradh Exp $ +# $NetBSD: Makefile,v 1.2 2020/07/01 09:58:29 riastradh Exp $ .include @@ -51,11 +51,16 @@ SRCS.t_aes+= aes_sse2_dec.c SRCS.t_aes+= aes_sse2_enc.c SRCS.t_aes+= aes_sse2_impl.c SRCS.t_aes+= aes_sse2_subr.c +COPTS.aes_sse2.c+= -msse -msse2 +COPTS.aes_sse2_dec.c+= -msse -msse2 +COPTS.aes_sse2_enc.c+= -msse -msse2 +COPTS.aes_sse2_subr.c+= -msse -msse2 SRCS.t_aes+= aes_ssse3.c SRCS.t_aes+= aes_ssse3_impl.c SRCS.t_aes+= aes_ssse3_subr.c -COPTS.aes_ssse3.c+= -msse3 -mssse3 +COPTS.aes_ssse3.c+= -msse -msse2 -msse3 -mssse3 +COPTS.aes_ssse3_subr.c+= -msse -msse2 -msse3 -mssse3 SRCS.t_aes+= aes_via.c
CVS commit: src/tests/sys/uvm
Module Name:src
Committed By: fox
Date: Wed Jan 16 13:54:17 UTC 2019
Modified Files:
src/tests/sys/uvm: t_uvm_physseg.c
Log Message:
Fixed issues with uvm_page_physunload_delete_end test case.
1. "avail_start" and "start" were different, resulting in unreachable code in
uvm_page_physunload(), where the condition check "avail_start" < "end" fails.
The test has been fixed by setting "avail_start" and "start" to the same value.
2. If "start" is the address with end address being "start + 2", we can
unplug twice, the first paddr_t would be "start" and the second one would be
"start + 1". Modified the ATF_CHECK_EQ() to reflect these changes.
Reviewed by
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/sys/uvm/t_uvm_physseg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/uvm/t_uvm_physseg.c
diff -u src/tests/sys/uvm/t_uvm_physseg.c:1.7 src/tests/sys/uvm/t_uvm_physseg.c:1.8
--- src/tests/sys/uvm/t_uvm_physseg.c:1.7 Wed Jan 16 13:45:29 2019
+++ src/tests/sys/uvm/t_uvm_physseg.c Wed Jan 16 13:54:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_uvm_physseg.c,v 1.7 2019/01/16 13:45:29 fox Exp $ */
+/* $NetBSD: t_uvm_physseg.c,v 1.8 2019/01/16 13:54:17 fox Exp $ */
/*-
* Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: t_uvm_physseg.c,v 1.7 2019/01/16 13:45:29 fox Exp $");
+__RCSID("$NetBSD: t_uvm_physseg.c,v 1.8 2019/01/16 13:54:17 fox Exp $");
/*
* If this line is commented out tests related to uvm_physseg_get_pmseg()
@@ -2155,7 +2155,7 @@ ATF_TC_BODY(uvm_page_physunload_delete_e
*/
upm = uvm_page_physload(VALID_START_PFN_1, VALID_START_PFN_1 + 2,
- VALID_AVAIL_START_PFN_1 + 1, VALID_AVAIL_START_PFN_1 + 2,
+ VALID_AVAIL_START_PFN_1, VALID_AVAIL_START_PFN_1 + 2,
VM_FREELIST_DEFAULT);
ATF_REQUIRE_EQ(1, uvm_physseg_get_entries());
@@ -2177,11 +2177,13 @@ ATF_TC_BODY(uvm_page_physunload_delete_e
ATF_CHECK_EQ(true, uvm_page_physunload(upm, VM_FREELIST_DEFAULT, &p));
+ ATF_CHECK_EQ(VALID_START_PFN_1, atop(p));
+
p = 0;
ATF_CHECK_EQ(true, uvm_page_physunload(upm, VM_FREELIST_DEFAULT, &p));
- ATF_CHECK_EQ(VALID_START_PFN_1 + 2, atop(p));
+ ATF_CHECK_EQ(VALID_START_PFN_1 + 1, atop(p));
ATF_CHECK_EQ(1, uvm_physseg_get_entries());
CVS commit: src/tests/sys/uvm
Module Name:src
Committed By: fox
Date: Wed Jan 16 13:45:29 UTC 2019
Modified Files:
src/tests/sys/uvm: t_uvm_physseg.c
Log Message:
Fixed issues with uvm_physseg_atboot_free_leak test case.
"\n" in ATF discriptions make it behave in weird ways, like saying "this
test is bogus.", fixed the issue by removing the "\n".
Reviewed by
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/sys/uvm/t_uvm_physseg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/uvm/t_uvm_physseg.c
diff -u src/tests/sys/uvm/t_uvm_physseg.c:1.6 src/tests/sys/uvm/t_uvm_physseg.c:1.7
--- src/tests/sys/uvm/t_uvm_physseg.c:1.6 Wed Jan 16 13:35:51 2019
+++ src/tests/sys/uvm/t_uvm_physseg.c Wed Jan 16 13:45:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_uvm_physseg.c,v 1.6 2019/01/16 13:35:51 fox Exp $ */
+/* $NetBSD: t_uvm_physseg.c,v 1.7 2019/01/16 13:45:29 fox Exp $ */
/*-
* Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: t_uvm_physseg.c,v 1.6 2019/01/16 13:35:51 fox Exp $");
+__RCSID("$NetBSD: t_uvm_physseg.c,v 1.7 2019/01/16 13:45:29 fox Exp $");
/*
* If this line is commented out tests related to uvm_physseg_get_pmseg()
@@ -401,7 +401,7 @@ ATF_TC(uvm_physseg_atboot_free_leak);
ATF_TC_HEAD(uvm_physseg_atboot_free_leak, tc)
{
atf_tc_set_md_var(tc, "descr",
- "does free() leak at boot ?\n"
+ "does free() leak at boot ?"
"This test needs VM_PHYSSEG_MAX > 1)");
}
CVS commit: src/tests/sys/uvm
Module Name:src
Committed By: fox
Date: Wed Jan 16 13:35:51 UTC 2019
Modified Files:
src/tests/sys/uvm: t_uvm_physseg.c
Log Message:
Fixed issues with uvm_physseg_plug test case.
There is a condition check which failed for VM_PHYSSEG_MAX == 2 (not for
1 or 3 and above), in case of 2, pgs == slab + npages1 + npages3, so we
need to change ">" check to ">=" check.
Reviewed by
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/sys/uvm/t_uvm_physseg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/uvm/t_uvm_physseg.c
diff -u src/tests/sys/uvm/t_uvm_physseg.c:1.5 src/tests/sys/uvm/t_uvm_physseg.c:1.6
--- src/tests/sys/uvm/t_uvm_physseg.c:1.5 Wed Jan 16 13:21:02 2019
+++ src/tests/sys/uvm/t_uvm_physseg.c Wed Jan 16 13:35:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_uvm_physseg.c,v 1.5 2019/01/16 13:21:02 fox Exp $ */
+/* $NetBSD: t_uvm_physseg.c,v 1.6 2019/01/16 13:35:51 fox Exp $ */
/*-
* Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: t_uvm_physseg.c,v 1.5 2019/01/16 13:21:02 fox Exp $");
+__RCSID("$NetBSD: t_uvm_physseg.c,v 1.6 2019/01/16 13:35:51 fox Exp $");
/*
* If this line is commented out tests related to uvm_physseg_get_pmseg()
@@ -522,7 +522,7 @@ ATF_TC_BODY(uvm_physseg_plug, tc)
ATF_REQUIRE_EQ(uvm_physseg_plug(VALID_START_PFN_4, npages4, &upm4), true);
/* The hot plug slab should have nothing to do with the original slab */
pgs = uvm_physseg_get_pg(upm4, 0);
- ATF_REQUIRE(pgs < slab || pgs > (slab + npages1
+ ATF_REQUIRE(pgs < slab || pgs >= (slab + npages1
#if VM_PHYSSEG_MAX > 2
+ npages2
#endif
CVS commit: src/tests/sys/uvm
Module Name:src
Committed By: fox
Date: Wed Jan 16 13:21:02 UTC 2019
Modified Files:
src/tests/sys/uvm: t_uvm_physseg.c
Log Message:
Fixed the build failures caused by incompatible type comparisons when
VM_PHYSSEG is > 1.
Reviewed by
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/sys/uvm/t_uvm_physseg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/uvm/t_uvm_physseg.c
diff -u src/tests/sys/uvm/t_uvm_physseg.c:1.4 src/tests/sys/uvm/t_uvm_physseg.c:1.5
--- src/tests/sys/uvm/t_uvm_physseg.c:1.4 Tue Dec 18 07:11:35 2018
+++ src/tests/sys/uvm/t_uvm_physseg.c Wed Jan 16 13:21:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_uvm_physseg.c,v 1.4 2018/12/18 07:11:35 fox Exp $ */
+/* $NetBSD: t_uvm_physseg.c,v 1.5 2019/01/16 13:21:02 fox Exp $ */
/*-
* Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: t_uvm_physseg.c,v 1.4 2018/12/18 07:11:35 fox Exp $");
+__RCSID("$NetBSD: t_uvm_physseg.c,v 1.5 2019/01/16 13:21:02 fox Exp $");
/*
* If this line is commented out tests related to uvm_physseg_get_pmseg()
@@ -512,7 +512,7 @@ ATF_TC_BODY(uvm_physseg_plug, tc)
#if VM_PHYSSEG_MAX > 2
+ npages2
#endif
- + npages3, uvmexp.npages);
+ + npages3, INT_TO_PSIZE_T(uvmexp.npages));
/* Scavenge plug should fit right in the slab */
pgs = uvm_physseg_get_pg(upm3, 0);
CVS commit: src/tests/sys/uvm
Module Name:src
Committed By: fox
Date: Tue Dec 18 07:11:35 UTC 2018
Modified Files:
src/tests/sys/uvm: t_uvm_physseg.c
Log Message:
Fixed the build failures caused by incompatible type comparisons.
Reviewed by
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/sys/uvm/t_uvm_physseg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/uvm/t_uvm_physseg.c
diff -u src/tests/sys/uvm/t_uvm_physseg.c:1.3 src/tests/sys/uvm/t_uvm_physseg.c:1.4
--- src/tests/sys/uvm/t_uvm_physseg.c:1.3 Thu Feb 8 09:05:20 2018
+++ src/tests/sys/uvm/t_uvm_physseg.c Tue Dec 18 07:11:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: t_uvm_physseg.c,v 1.3 2018/02/08 09:05:20 dholland Exp $ */
+/* $NetBSD: t_uvm_physseg.c,v 1.4 2018/12/18 07:11:35 fox Exp $ */
/*-
* Copyright (c) 2015, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: t_uvm_physseg.c,v 1.3 2018/02/08 09:05:20 dholland Exp $");
+__RCSID("$NetBSD: t_uvm_physseg.c,v 1.4 2018/12/18 07:11:35 fox Exp $");
/*
* If this line is commented out tests related to uvm_physseg_get_pmseg()
@@ -271,6 +271,11 @@ uvm_physseg_alloc(size_t sz)
#endif
/*
+ * This macro was added to convert uvmexp.npages from int to psize_t
+ */
+#define INT_TO_PSIZE_T(X) (psize_t)X
+
+/*
* Test Fixture SetUp().
*/
static void
@@ -498,7 +503,7 @@ ATF_TC_BODY(uvm_physseg_plug, tc)
#if VM_PHYSSEG_MAX > 2
+ npages2
#endif
- , uvmexp.npages);
+ , INT_TO_PSIZE_T(uvmexp.npages));
#if VM_PHYSSEG_MAX > 1
/* Scavenge plug - goes into the same slab */
ATF_REQUIRE_EQ(uvm_physseg_plug(VALID_START_PFN_3, npages3, &upm3), true);
@@ -706,7 +711,7 @@ ATF_TC_BODY(uvm_page_physload_postboot,
/* Should return a valid handle */
ATF_REQUIRE(uvm_physseg_valid_p(upm));
- ATF_REQUIRE_EQ(npages1 + npages2, uvmexp.npages);
+ ATF_REQUIRE_EQ(npages1 + npages2, INT_TO_PSIZE_T(uvmexp.npages));
/* After the second call two segments should exist */
ATF_CHECK_EQ(2, uvm_physseg_get_entries());
@@ -889,7 +894,7 @@ ATF_TC_BODY(uvm_physseg_init_seg, tc)
uvm_physseg_init_seg(PHYSSEG_NODE_TO_HANDLE(seg), pgs);
- ATF_REQUIRE_EQ(npages, uvmexp.npages);
+ ATF_REQUIRE_EQ(npages, INT_TO_PSIZE_T(uvmexp.npages));
}
#if 0
@@ -2279,7 +2284,11 @@ ATF_TC_BODY(uvm_page_physunload_force, t
upm = uvm_physseg_find(VALID_AVAIL_END_PFN_1 - 1, NULL);
/* It should no longer exist */
+#if defined(UVM_HOTPLUG)
ATF_CHECK_EQ(NULL, upm);
+#else
+ ATF_CHECK_EQ(-1, upm);
+#endif
ATF_CHECK_EQ(1, uvm_physseg_get_entries());
}
CVS commit: src/tests/sys/net
Module Name:src
Committed By: christos
Date: Sat Aug 27 11:30:49 UTC 2016
Modified Files:
src/tests/sys/net: t_print.c
Log Message:
catch up with link printing.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/net/t_print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/net/t_print.c
diff -u src/tests/sys/net/t_print.c:1.1 src/tests/sys/net/t_print.c:1.2
--- src/tests/sys/net/t_print.c:1.1 Tue Dec 2 14:48:21 2014
+++ src/tests/sys/net/t_print.c Sat Aug 27 07:30:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $ */
+/* $NetBSD: t_print.c,v 1.2 2016/08/27 11:30:49 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $");
+__RCSID("$NetBSD: t_print.c,v 1.2 2016/08/27 11:30:49 christos Exp $");
#include "net/dl_print.c"
@@ -147,7 +147,10 @@ ATF_TC_BODY(sdl_print, tc)
memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr));
sdl.sdl_index = (uint16_t)i;
r = sdl_print(buf, l, &sdl);
- e = snprintf(res, l, "[%s]:%zu", tst[i].str, i);
+ if (i == 3)
+ e = snprintf(res, l, "link#%zu", i);
+ else
+ e = snprintf(res, l, "[%s]:%zu", tst[i].str, i);
ATF_REQUIRE_STREQ(buf, res);
ATF_REQUIRE_EQ(r, e);
}
@@ -157,7 +160,10 @@ ATF_TC_BODY(sdl_print, tc)
memcpy(&sdl.sdl_addr, &tst[i].ia, sizeof(sdl.sdl_addr));
sdl.sdl_index = (uint16_t)i;
r = sdl_print(buf, l, &sdl);
- e = snprintf(res, l, "[%s]:%zu", tst[i].str, i);
+ if (i == 3)
+ e = snprintf(res, l, "link#%zu", i);
+ else
+ e = snprintf(res, l, "[%s]:%zu", tst[i].str, i);
ATF_REQUIRE_STREQ(buf, res);
ATF_REQUIRE_EQ(r, e);
}
CVS commit: src/tests/sys
Module Name:src
Committed By: christos
Date: Wed Dec 3 13:10:49 UTC 2014
Modified Files:
src/tests/sys/netinet: t_print.c
src/tests/sys/netinet6: t_print.c
Log Message:
Add casts for big endian machines
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/netinet/t_print.c
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/netinet6/t_print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/netinet/t_print.c
diff -u src/tests/sys/netinet/t_print.c:1.1 src/tests/sys/netinet/t_print.c:1.2
--- src/tests/sys/netinet/t_print.c:1.1 Tue Dec 2 14:48:21 2014
+++ src/tests/sys/netinet/t_print.c Wed Dec 3 08:10:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $ */
+/* $NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $");
+__RCSID("$NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $");
#include "netinet/in_print.c"
@@ -109,7 +109,7 @@ ATF_TC_BODY(sin_print, tc)
for (size_t i = 0; i < __arraycount(tst); i++) {
sin.sin_addr = tst[i].ia;
- sin.sin_port = htons(i);
+ sin.sin_port = (in_port_t)htons(i);
r = sin_print(buf, l, &sin);
if (i == 0)
e = snprintf(res, sizeof(res), "%s", tst[i].str);
@@ -123,7 +123,7 @@ ATF_TC_BODY(sin_print, tc)
l = 14;
for (size_t i = 0; i < __arraycount(tst); i++) {
sin.sin_addr = tst[i].ia;
- sin.sin_port = htons(i);
+ sin.sin_port = (in_port_t)htons(i);
r = sin_print(buf, l, &sin);
if (i == 0)
e = snprintf(res, l, "%s", tst[i].str);
Index: src/tests/sys/netinet6/t_print.c
diff -u src/tests/sys/netinet6/t_print.c:1.1 src/tests/sys/netinet6/t_print.c:1.2
--- src/tests/sys/netinet6/t_print.c:1.1 Tue Dec 2 14:48:21 2014
+++ src/tests/sys/netinet6/t_print.c Wed Dec 3 08:10:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $ */
+/* $NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $");
+__RCSID("$NetBSD: t_print.c,v 1.2 2014/12/03 13:10:49 christos Exp $");
#include "netinet6/in6_print.c"
#include "netinet/in_print.c"
@@ -118,7 +118,7 @@ ATF_TC_BODY(sin6_print, tc)
for (size_t i = 0; i < __arraycount(tst); i++) {
sin6.sin6_addr = tst[i].ia;
- sin6.sin6_port = htons(i);
+ sin6.sin6_port = (in_port_t)htons(i);
r = sin6_print(buf, l, &sin6);
if (i == 0)
e = snprintf(res, sizeof(res), "%s", tst[i].str);
@@ -133,7 +133,7 @@ ATF_TC_BODY(sin6_print, tc)
l = 14;
for (size_t i = 0; i < __arraycount(tst); i++) {
sin6.sin6_addr = tst[i].ia;
- sin6.sin6_port = htons(i);
+ sin6.sin6_port = (in_port_t)htons(i);
r = sin6_print(buf, l, &sin6);
if (i == 0)
e = snprintf(res, l, "%s", tst[i].str);
CVS commit: src/tests/sys/net
Module Name:src
Committed By: ozaki-r
Date: Wed Dec 3 08:14:26 UTC 2014
Modified Files:
src/tests/sys/net: Makefile
Log Message:
Fix TESTSDIR
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/net/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/sys/net/Makefile
diff -u src/tests/sys/net/Makefile:1.1 src/tests/sys/net/Makefile:1.2
--- src/tests/sys/net/Makefile:1.1 Tue Dec 2 19:48:21 2014
+++ src/tests/sys/net/Makefile Wed Dec 3 08:14:26 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2014/12/02 19:48:21 christos Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/03 08:14:26 ozaki-r Exp $
#
WARNS?=6
.include
-TESTSDIR= ${TESTSBASE}/sys/netatalk
+TESTSDIR= ${TESTSBASE}/sys/net
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -D_TEST
TESTS_C= t_print
CVS commit: src/tests/sys
Module Name:src
Committed By: christos
Date: Tue Dec 2 19:48:21 UTC 2014
Modified Files:
src/tests/sys: Makefile
Added Files:
src/tests/sys/net: Makefile t_print.c
src/tests/sys/netatalk: Makefile t_print.c
src/tests/sys/netinet: Makefile t_print.c
src/tests/sys/netinet6: Makefile t_print.c
Log Message:
tests for network address printers.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sys/net/Makefile src/tests/sys/net/t_print.c
cvs rdiff -u -r0 -r1.1 src/tests/sys/netatalk/Makefile \
src/tests/sys/netatalk/t_print.c
cvs rdiff -u -r0 -r1.1 src/tests/sys/netinet/Makefile \
src/tests/sys/netinet/t_print.c
cvs rdiff -u -r0 -r1.1 src/tests/sys/netinet6/Makefile \
src/tests/sys/netinet6/t_print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/Makefile
diff -u src/tests/sys/Makefile:1.2 src/tests/sys/Makefile:1.3
--- src/tests/sys/Makefile:1.2 Tue Jul 13 17:13:30 2010
+++ src/tests/sys/Makefile Tue Dec 2 14:48:21 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2014/12/02 19:48:21 christos Exp $
.include
TESTSDIR= ${TESTSBASE}/sys
-TESTS_SUBDIRS+= rc
+TESTS_SUBDIRS+= net netatalk netinet netinet6 rc
.include
Added files:
Index: src/tests/sys/net/Makefile
diff -u /dev/null src/tests/sys/net/Makefile:1.1
--- /dev/null Tue Dec 2 14:48:21 2014
+++ src/tests/sys/net/Makefile Tue Dec 2 14:48:21 2014
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2014/12/02 19:48:21 christos Exp $
+#
+WARNS?=6
+
+.include
+
+TESTSDIR= ${TESTSBASE}/sys/netatalk
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys -D_TEST
+
+TESTS_C= t_print
+
+.include
Index: src/tests/sys/net/t_print.c
diff -u /dev/null src/tests/sys/net/t_print.c:1.1
--- /dev/null Tue Dec 2 14:48:21 2014
+++ src/tests/sys/net/t_print.c Tue Dec 2 14:48:21 2014
@@ -0,0 +1,172 @@
+/* $NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include
+__RCSID("$NetBSD: t_print.c,v 1.1 2014/12/02 19:48:21 christos Exp $");
+
+#include "net/dl_print.c"
+
+#include
+
+static const struct {
+ struct dl_addr ia;
+ const char *str;
+ int len;
+} tst[] = {
+ {
+ {
+ .dl_type = 6,
+ .dl_nlen = 0,
+ .dl_alen = 6,
+ .dl_slen = 0,
+ .dl_data = {
+ (char)0x01, (char)0xa2, (char)0x03,
+ (char)0xc4, (char)0x05, (char)0xf6,
+ },
+ },
+ "/6#01:a2:03:c4:05:f6",
+ 20,
+ },
+ {
+ {
+ .dl_type = 24,
+ .dl_nlen = 3,
+ .dl_alen = 6,
+ .dl_slen = 0,
+ .dl_data = {
+ 'l', 'o', '0',
+ (char)0x11, (char)0x22, (char)0x33,
+ (char)0x44, (char)0x55, (char)0x66,
+ },
+ },
+ "lo0/24#11:22:33:44:55:66",
+ 24,
+ },
+ {
+ {
+ .dl_type = 24,
+ .dl_nlen = 7,
+ .dl_alen = 1,
+ .dl_slen = 0,
+ .dl_data = {
+ 'n', 'p', 'f', 'l', 'o', 'g', '0', (char)0xa5,
+ },
+ },
+ "npflog0/24#a5",
+ 13,
+ },
+ {
+ {
+ .dl_type = 0,
+ .dl_nlen = 0,
+ .dl_alen = 0,
+ .dl_slen = 0,
+ .dl_data = {
+ '\0'
+ },
+ },
+ "/0#",
+ 3,
+ },
+};
+
+
+ATF_TC(dl_print);
+ATF_TC_HEAD(dl_print, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "printing of link address");
+}
+
+ATF_TC_BODY(dl_print, tc)
+{
+ char buf[LINK_ADDRSTRLEN];
+ int r;
+ size_t l = sizeof(buf);
+
+ for (size_t i = 0; i < __arraycount(tst); i++) {
+ r = dl_print(buf, l, &
CVS commit: src/tests/sys/rc
Module Name:src
Committed By: jmmv
Date: Tue May 4 09:33:57 UTC 2010
Modified Files:
src/tests/sys/rc: t_rc_d_cli.sh
Log Message:
Fix execution of the installed tests by using h_{simple,args} as program
names, without the .sh extension.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/rc/t_rc_d_cli.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sys/rc/t_rc_d_cli.sh
diff -u src/tests/sys/rc/t_rc_d_cli.sh:1.1 src/tests/sys/rc/t_rc_d_cli.sh:1.2
--- src/tests/sys/rc/t_rc_d_cli.sh:1.1 Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/t_rc_d_cli.sh Tue May 4 09:33:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_rc_d_cli.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+# $NetBSD: t_rc_d_cli.sh,v 1.2 2010/05/04 09:33:57 jmmv Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,7 +34,7 @@
}
no_command_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
atf_check -s eq:1 -o empty -e ignore ${rc_helper}
}
@@ -46,7 +46,7 @@
}
default_start_no_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
atf_check -s eq:0 -o ignore -e empty ${rc_helper} start
${rc_helper} forcestop
@@ -59,7 +59,7 @@
}
default_start_with_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
atf_check -s eq:1 -o ignore -e ignore ${rc_helper} start foo
if ${rc_helper} status >/dev/null; then
@@ -75,7 +75,7 @@
}
default_stop_no_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:0 -o ignore -e empty ${rc_helper} stop
@@ -88,7 +88,7 @@
}
default_stop_with_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:1 -o ignore -e ignore ${rc_helper} stop foo
@@ -106,7 +106,7 @@
}
default_restart_no_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:0 -o ignore -e empty ${rc_helper} restart
@@ -120,7 +120,7 @@
}
default_restart_with_args_body() {
export h_simple=YES
- rc_helper=$(atf_get_srcdir)/h_simple.sh
+ rc_helper=$(atf_get_srcdir)/h_simple
${rc_helper} start
atf_check -s eq:1 -o ignore -e ignore ${rc_helper} restart foo
@@ -131,7 +131,7 @@
local command="${1}"; shift
export h_args=YES
- rc_helper=$(atf_get_srcdir)/h_args.sh
+ rc_helper=$(atf_get_srcdir)/h_args
cat >expout
