[src/trunk]: src/tests/lib/libc/misc - revert previous to t_ubsan.c, it is de...

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

details:   https://anonhg.NetBSD.org/src/rev/d157286d8261
branches:  trunk
changeset: 838896:d157286d8261
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 04 03:10:33 2019 +0000

description:
- revert previous to t_ubsan.c, it is desired behaviour.  from kamil.
- use -Wno-int-in-bool-context instead

diffstat:

 tests/lib/libc/misc/Makefile  |  7 ++++++-
 tests/lib/libc/misc/t_ubsan.c |  6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r b78c073f7abb -r d157286d8261 tests/lib/libc/misc/Makefile
--- a/tests/lib/libc/misc/Makefile      Mon Feb 04 03:01:52 2019 +0000
+++ b/tests/lib/libc/misc/Makefile      Mon Feb 04 03:10:33 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/08/09 12:45:15 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/02/04 03:10:33 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -27,4 +27,9 @@
 COPTS.t_ubsan.c += -Wno-stack-protector
 COPTS.t_ubsanxx.cpp += -Wno-stack-protector
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.t_ubsan.c+=      -Wno-int-in-bool-context
+COPTS.t_ubsanxx.cpp+=  -Wno-int-in-bool-context
+.endif
+
 .include <bsd.test.mk>
diff -r b78c073f7abb -r d157286d8261 tests/lib/libc/misc/t_ubsan.c
--- a/tests/lib/libc/misc/t_ubsan.c     Mon Feb 04 03:01:52 2019 +0000
+++ b/tests/lib/libc/misc/t_ubsan.c     Mon Feb 04 03:10:33 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_ubsan.c,v 1.2 2019/02/03 10:45:58 mrg Exp $  */
+/*     $NetBSD: t_ubsan.c,v 1.3 2019/02/04 03:10:33 mrg Exp $  */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2018\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ubsan.c,v 1.2 2019/02/03 10:45:58 mrg Exp $");
+__RCSID("$NetBSD: t_ubsan.c,v 1.3 2019/02/04 03:10:33 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -376,7 +376,7 @@
        volatile int a = INT_MAX;
        volatile int b = atoi("2");
 
-       raise((a && b) ? SIGSEGV : SIGBUS);
+       raise((a * b) ? SIGSEGV : SIGBUS);
 }
 
 UBSAN_TC_BODY(mul_overflow_signed, tc)