Skip to contentSkip to conversation

tools/nolibc: assorted build fixes for nolibc-test in rare cases

PATCH In review Willy Tarreau 2 participants 4 messages Apr 2, 2023

Subsystems (2)
lore
Share & tools
lore

Willy Tarreau

author maintainer
#0 lore raw

cover tools/nolibc: assorted build fixes for nolibc-test in rare cases

Hello Paul,

please find in this series two small build fixes. One of them concerns two missing include files for building the test against other libc (at least glibc) since we added the tests for integer types and ranges. The second one removes a single occurrence of a variable definition inside the init statement of a for loop that breaks with older compilers which do not default to c99. They're still convenient to test the portability of the lib itself and I continue to use them for this purpose.

I consider that there's no rush on this, since these issues only affect developers adding test cases, who should normally rebase on top of your dev branch. So it's fine if it goes there.

Thank you!
Willy

Willy Tarreau (2):
tools/nolibc: tests: fix build on non-c99 compliant compilers tools/nolibc: fix build of the test case using glibc

 tools/testing/selftests/nolibc/nolibc-test.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.5
author maintainer
#1 lore raw

PATCH 1/2 tools/nolibc: tests: fix build on non-c99 compliant compilers

Commit 9735716830f2 ("tools/nolibc: tests: add test for -fstack-protector") brought a declaration inside the initialization statement of a for loop, which breaks the build on compilers that do not default to c99 compatibility, making it more difficult to validate that the lib still builds on such compilers. The fix is trivial, so let's move the declaration to the variables block of the function instead. No backport is needed.

Cc Thomas Weißschuh <[email protected]>
---
 tools/testing/selftests/nolibc/nolibc-test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/nolibc/nolibc-test.c +2 -1
index 47013b78972e..6f2f109569a3 100644
@@ -671,8 +671,9 @@ static int smash_stack(void)
 {
 	char buf[100];
 	volatile char *ptr = buf;
+	size_t i;
 
-	for (size_t i = 0; i < 200; i++)
+	for (i = 0; i < 200; i++)
 		ptr[i] = 'P';
 
 	return 1;
Signature · 1 line
2.17.5
author maintainer
#2 lore raw

PATCH 2/2 tools/nolibc: fix build of the test case using glibc

In reply to Willy Tarreau

Some extra tests for various integer types and limits were added by commit d1209597ff00 ("tools/nolibc: add tests for the integer limits in stdint.h"), but we forgot to retest with glibc. Stddef and stdint are now needed for the program to build there.

Cc Vincent Dagonneau <[email protected]>
---
 tools/testing/selftests/nolibc/nolibc-test.c | 2 ++
 1 file changed, 2 insertions(+)
tools/testing/selftests/nolibc/nolibc-test.c +2 -0
index 6f2f109569a3..1bafbd8da6af 100644
@@ -34,6 +34,8 @@
 #include <sched.h>
 #include <signal.h>
 #include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <unistd.h>
 #endif
 #endif
Signature · 1 line
2.17.5
#3 lore raw
In reply to Willy Tarreau
Quoted 10 lines · Willy Tarreau

Hello Paul,

please find in this series two small build fixes. One of them concerns two missing include files for building the test against other libc (at least glibc) since we added the tests for integer types and ranges. The second one removes a single occurrence of a variable definition inside the init statement of a for loop that breaks with older compilers which do not default to c99. They're still convenient to test the portability of the lib itself and I continue to use them for this purpose.

Quoted 3 lines

I consider that there's no rush on this, since these issues only affect developers adding test cases, who should normally rebase on top of your dev branch. So it's fine if it goes there.

Queued and pushed for the v6.5 merge window (the one after the upcoming one), thank you!

Thanx, Paul

Quoted 13 lines

Thank you!
Willy

Willy Tarreau (2):
tools/nolibc: tests: fix build on non-c99 compliant compilers tools/nolibc: fix build of the test case using glibc

 tools/testing/selftests/nolibc/nolibc-test.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.5