Module Name: src
Committed By: pooka
Date: Tue Mar 1 12:47:43 UTC 2011
Modified Files:
src/tests/lib/libc/gen: t_siginfo.c
src/tests/lib/libc/ieeefp: t_except.c
Log Message:
Attempt further qemu heuristics to avoid failures due to non-working FPU
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/gen/t_siginfo.c
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/ieeefp/t_except.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/lib/libc/gen/t_siginfo.c
diff -u src/tests/lib/libc/gen/t_siginfo.c:1.8 src/tests/lib/libc/gen/t_siginfo.c:1.9
--- src/tests/lib/libc/gen/t_siginfo.c:1.8 Mon Jan 3 20:51:26 2011
+++ src/tests/lib/libc/gen/t_siginfo.c Tue Mar 1 12:47:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_siginfo.c,v 1.8 2011/01/03 20:51:26 pgoyette Exp $ */
+/* $NetBSD: t_siginfo.c,v 1.9 2011/03/01 12:47:43 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -298,6 +298,10 @@
if (system("cpuctl identify 0 | grep -q QEMU") == 0)
atf_tc_skip("Test does not run correctly under qemu");
+ if (system("cpuctl identify 0 | grep -q "
+ "'cpu0: Intel Pentium II (Klamath) (686-class), id 0x633'") == 0)
+ atf_tc_skip("Test does not run correctly under qemu "
+ "(heuristic match)");
if (sigsetjmp(sigfpe_flt_env, 0) == 0) {
sa.sa_flags = SA_SIGINFO;
sa.sa_sigaction = sigfpe_flt_action;
Index: src/tests/lib/libc/ieeefp/t_except.c
diff -u src/tests/lib/libc/ieeefp/t_except.c:1.6 src/tests/lib/libc/ieeefp/t_except.c:1.7
--- src/tests/lib/libc/ieeefp/t_except.c:1.6 Tue Jan 4 22:30:41 2011
+++ src/tests/lib/libc/ieeefp/t_except.c Tue Mar 1 12:47:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_except.c,v 1.6 2011/01/04 22:30:41 pgoyette Exp $ */
+/* $NetBSD: t_except.c,v 1.7 2011/03/01 12:47:43 pooka Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -295,6 +295,11 @@
\
if (system("cpuctl identify 0 | grep -q QEMU") == 0) \
atf_tc_skip("Test not applicable on QEMU"); \
+ if (system("cpuctl identify 0 | grep -q \
+ 'cpu0: Intel Pentium II (Klamath) (686-class), id 0x633'")\
+ == 0) \
+ atf_tc_skip("Test not applicable on QEMU " \
+ "(heuristic match)"); \
m(t##_ops); \
}
