[src/trunk]: src/tests/lib/libc Attempt further qemu heuristics to avoid fail...

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

details:   https://anonhg.NetBSD.org/src/rev/c7251d728003
branches:  trunk
changeset: 762809:c7251d728003
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Mar 01 12:47:43 2011 +0000

description:
Attempt further qemu heuristics to avoid failures due to non-working FPU

diffstat:

 tests/lib/libc/gen/t_siginfo.c   |  6 +++++-
 tests/lib/libc/ieeefp/t_except.c |  7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 12e4eb5108f9 -r c7251d728003 tests/lib/libc/gen/t_siginfo.c
--- a/tests/lib/libc/gen/t_siginfo.c    Tue Mar 01 11:23:42 2011 +0000
+++ b/tests/lib/libc/gen/t_siginfo.c    Tue Mar 01 12:47:43 2011 +0000
@@ -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;
diff -r 12e4eb5108f9 -r c7251d728003 tests/lib/libc/ieeefp/t_except.c
--- a/tests/lib/libc/ieeefp/t_except.c  Tue Mar 01 11:23:42 2011 +0000
+++ b/tests/lib/libc/ieeefp/t_except.c  Tue Mar 01 12:47:43 2011 +0000
@@ -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);                                             \
        }