Module Name: src
Committed By: jruoho
Date: Fri Jul 8 05:10:05 UTC 2011
Modified Files:
src/tests/lib/libc/stdlib: t_strtod.c
src/tests/lib/libm: t_infinity.c
Log Message:
Remove the amd64-part from the Qemu checks. The following tests fail also on
i386/qemu: 'strtold_inf', 'strtold_nan', and 'infinity_long_double'. It seems
that more than anything else, these are dependent on the used Qemu version.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/lib/libc/stdlib/t_strtod.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_infinity.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/stdlib/t_strtod.c
diff -u src/tests/lib/libc/stdlib/t_strtod.c:1.23 src/tests/lib/libc/stdlib/t_strtod.c:1.24
--- src/tests/lib/libc/stdlib/t_strtod.c:1.23 Thu Jul 7 11:04:30 2011
+++ src/tests/lib/libc/stdlib/t_strtod.c Fri Jul 8 05:10:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strtod.c,v 1.23 2011/07/07 11:04:30 jruoho Exp $ */
+/* $NetBSD: t_strtod.c,v 1.24 2011/07/08 05:10:05 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Public domain, Otto Moerbeek <[email protected]>, 2006. */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_strtod.c,v 1.23 2011/07/07 11:04:30 jruoho Exp $");
+__RCSID("$NetBSD: t_strtod.c,v 1.24 2011/07/08 05:10:05 jruoho Exp $");
#include <sys/utsname.h>
@@ -164,17 +164,12 @@
#ifndef __vax__
# ifdef __HAVE_LONG_DOUBLE
- struct utsname utsname;
-
/*
* See the closed PR lib/33262.
*
* This may also fail under QEMU; cf. PR misc/44767.
*/
- ATF_REQUIRE(uname(&utsname) == 0);
-
- if (strcmp(utsname.machine, "amd64") == 0 &&
- system("cpuctl identify 0 | grep -q QEMU") == 0)
+ if (system("cpuctl identify 0 | grep -q QEMU") == 0)
atf_tc_expect_fail("PR misc/44767");
for (size_t i = 0; i < __arraycount(inf_strings); i++) {
@@ -238,7 +233,6 @@
#ifndef __vax__
# ifdef __HAVE_LONG_DOUBLE
- struct utsname utsname;
char *end;
/*
@@ -246,10 +240,7 @@
*
* This may also fail under QEMU; cf. PR misc/44767.
*/
- ATF_REQUIRE(uname(&utsname) == 0);
-
- if (strcmp(utsname.machine, "amd64") == 0 &&
- system("cpuctl identify 0 | grep -q QEMU") == 0)
+ if (system("cpuctl identify 0 | grep -q QEMU") == 0)
atf_tc_expect_fail("PR misc/44767");
long double ld = strtold(nan_string, &end);
Index: src/tests/lib/libm/t_infinity.c
diff -u src/tests/lib/libm/t_infinity.c:1.4 src/tests/lib/libm/t_infinity.c:1.5
--- src/tests/lib/libm/t_infinity.c:1.4 Thu Jul 7 11:04:30 2011
+++ src/tests/lib/libm/t_infinity.c Fri Jul 8 05:10:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_infinity.c,v 1.4 2011/07/07 11:04:30 jruoho Exp $ */
+/* $NetBSD: t_infinity.c,v 1.5 2011/07/08 05:10:05 jruoho Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -29,15 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_infinity.c,v 1.4 2011/07/07 11:04:30 jruoho Exp $");
-
-#include <sys/utsname.h>
+__RCSID("$NetBSD: t_infinity.c,v 1.5 2011/07/08 05:10:05 jruoho Exp $");
#include <atf-c.h>
#include <math.h>
#include <float.h>
#include <stdlib.h>
-#include <string.h>
ATF_TC(infinity_float);
ATF_TC_HEAD(infinity_float, tc)
@@ -92,15 +89,10 @@
ATF_TC_BODY(infinity_long_double, tc)
{
- struct utsname utsname;
-
/*
* May fail under QEMU; cf. PR misc/44767.
*/
- ATF_REQUIRE(uname(&utsname) == 0);
-
- if (strcmp(utsname.machine, "amd64") == 0 &&
- system("cpuctl identify 0 | grep -q QEMU") == 0)
+ if (system("cpuctl identify 0 | grep -q QEMU") == 0)
atf_tc_expect_fail("PR misc/44767");
#ifndef LDBL_MAX
