Module Name:    src
Committed By:   rillig
Date:           Tue May 25 19:22:18 UTC 2021

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/usr.bin/xlint/lint1: Makefile d_gcc_extension.c
Removed Files:
        src/tests/usr.bin/xlint/lint1: d_gcc_extension.exp

Log Message:
tests/lint: make test d_gcc_extension platform-independent

That test was intended to test the keywords '__extension__' and
'__typeof'.  The GCC builtin functions were just a side-effect.

These built-in functions generated error messages on platforms such as
amd64 where sizeof(long double) != sizeof(double), but not on others
such as sparc.

The current infrastructure for the lint tests cannot handle tests with
platform-dependent outcome.


To generate a diff of this commit:
cvs rdiff -u -r1.1053 -r1.1054 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.58 -r1.59 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/d_gcc_extension.c
cvs rdiff -u -r1.6 -r0 src/tests/usr.bin/xlint/lint1/d_gcc_extension.exp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1053 src/distrib/sets/lists/tests/mi:1.1054
--- src/distrib/sets/lists/tests/mi:1.1053	Mon May 17 04:07:42 2021
+++ src/distrib/sets/lists/tests/mi	Tue May 25 19:22:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1053 2021/05/17 04:07:42 yamaguchi Exp $
+# $NetBSD: mi,v 1.1054 2021/05/25 19:22:18 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -6157,7 +6157,7 @@
 ./usr/tests/usr.bin/xlint/lint1/d_gcc_compound_statements2.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_gcc_compound_statements3.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_gcc_extension.c		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/d_gcc_extension.exp		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_gcc_extension.exp		tests-obsolete		obsolete
 ./usr/tests/usr.bin/xlint/lint1/d_gcc_func.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_incorrect_array_size.c	tests-usr.bin-tests	compattestfile,atf

Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.58 src/tests/usr.bin/xlint/lint1/Makefile:1.59
--- src/tests/usr.bin/xlint/lint1/Makefile:1.58	Sun May 16 11:11:37 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile	Tue May 25 19:22:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2021/05/16 11:11:37 rillig Exp $
+# $NetBSD: Makefile,v 1.59 2021/05/25 19:22:18 rillig Exp $
 
 NOMAN=		# defined
 MAX_MESSAGE=	344		# see lint1/err.c
@@ -67,7 +67,6 @@ FILES+=		d_gcc_compound_statements1.c
 FILES+=		d_gcc_compound_statements2.c
 FILES+=		d_gcc_compound_statements3.c
 FILES+=		d_gcc_extension.c
-FILES+=		d_gcc_extension.exp
 FILES+=		d_gcc_func.c
 FILES+=		d_gcc_variable_array_init.c
 FILES+=		d_incorrect_array_size.c

Index: src/tests/usr.bin/xlint/lint1/d_gcc_extension.c
diff -u src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.5 src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.6
--- src/tests/usr.bin/xlint/lint1/d_gcc_extension.c:1.5	Mon Apr  5 01:35:34 2021
+++ src/tests/usr.bin/xlint/lint1/d_gcc_extension.c	Tue May 25 19:22:18 2021
@@ -1,6 +1,12 @@
-/*	$NetBSD: d_gcc_extension.c,v 1.5 2021/04/05 01:35:34 rillig Exp $	*/
+/*	$NetBSD: d_gcc_extension.c,v 1.6 2021/05/25 19:22:18 rillig Exp $	*/
 # 3 "d_gcc_extension.c"
 
+/*
+ * Test that the GCC '__extension__' and '__typeof' are recognized.
+ */
+
+_Bool dbl_isinf(double);
+
 /* extension */
 void
 a(void)
@@ -8,7 +14,7 @@ a(void)
 	double __logbw = 1;
 	if (__extension__(({
 		__typeof((__logbw)) x_ = (__logbw);
-		!__builtin_isinf((x_)) && !__builtin_isnan((x_)); /* expect: 259 *//* expect: 259 */
+		!dbl_isinf((x_));
 	})))
 		__logbw = 1;
 }

Reply via email to