Patch all tests to use the correct ifdef guards and change the signal to SIGTRAP

AlyElashram · AlyElashram · commit ee9e873eed70 · 2025-05-31T01:42:03.000+03:00
diff --git a/libc/test/src/string/memchr_test.cpp b/libc/test/src/string/memchr_test.cpp
@@ -122,11 +122,11 @@ TEST(LlvmLibcMemChrTest, SignedCharacterFound) {
   ASSERT_EQ(actual[0], c);
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcMemChrTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::memchr(nullptr, 1, 1); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/memcmp_test.cpp b/libc/test/src/string/memcmp_test.cpp
@@ -66,11 +66,11 @@ TEST(LlvmLibcMemcmpTest, SizeSweep) {
   }
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcMemcmpTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::memcmp(nullptr, nullptr, 1); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/memcpy_test.cpp b/libc/test/src/string/memcpy_test.cpp
@@ -73,11 +73,11 @@ TEST(LlvmLibcMemcpyTest, CheckAccess) {
 
 #endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX)
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcMemcpyTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::memcpy(nullptr, nullptr, 1); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
 
diff --git a/libc/test/src/string/memmove_test.cpp b/libc/test/src/string/memmove_test.cpp
@@ -104,11 +104,11 @@ TEST(LlvmLibcMemmoveTest, SizeSweep) {
     }
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcMemmoveTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::memmove(nullptr, nullptr, 0); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // LIBC_TARGET_OS_IS_LINUX
diff --git a/libc/test/src/string/mempcpy_test.cpp b/libc/test/src/string/mempcpy_test.cpp
@@ -27,11 +27,11 @@ TEST(LlvmLibcMempcpyTest, ZeroCount) {
   ASSERT_EQ(static_cast<char *>(result), dest + 0);
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcMempcpyTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::mempcpy(nullptr, nullptr, 0); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/memrchr_test.cpp b/libc/test/src/string/memrchr_test.cpp
@@ -114,11 +114,11 @@ TEST(LlvmLibcMemRChrTest, ZeroLengthShouldReturnNullptr) {
   ASSERT_STREQ(call_memrchr(src, 'd', 0), nullptr);
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcMemRChrTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::memrchr(nullptr, 'd', 1); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/memset_test.cpp b/libc/test/src/string/memset_test.cpp
@@ -60,11 +60,11 @@ TEST(LlvmLibcMemsetTest, CheckAccess) {
 
 #endif // !defined(LIBC_FULL_BUILD) && defined(LIBC_TARGET_OS_IS_LINUX)
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcMemsetTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::memset(nullptr, 0, 1); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/stpncpy_test.cpp b/libc/test/src/string/stpncpy_test.cpp
@@ -73,11 +73,11 @@ TEST_F(LlvmLibcStpncpyTest, CopyTwoWithNull) {
   check_stpncpy(dst, src, 2, expected, 1);
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST_F(LlvmLibcStpncpyTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::stpncpy(nullptr, nullptr, 1); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/strcat_test.cpp b/libc/test/src/string/strcat_test.cpp
@@ -37,11 +37,11 @@ TEST(LlvmLibcStrCatTest, NonEmptyDest) {
   ASSERT_STREQ(dest, "xyzabc");
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcStrCatTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::strcat(nullptr, nullptr); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/strcoll_test.cpp b/libc/test/src/string/strcoll_test.cpp
@@ -30,11 +30,11 @@ TEST(LlvmLibcStrcollTest, SimpleTest) {
   ASSERT_GT(result, 0);
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcStrcollTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::strcoll(nullptr, nullptr); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/strcpy_test.cpp b/libc/test/src/string/strcpy_test.cpp
@@ -44,11 +44,11 @@ TEST(LlvmLibcStrCpyTest, OffsetDest) {
   ASSERT_STREQ(dest, "xyzabc");
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcStrCpyTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::strcpy(nullptr, nullptr); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/strsep_test.cpp b/libc/test/src/string/strsep_test.cpp
@@ -53,11 +53,11 @@ TEST(LlvmLibcStrsepTest, DelimitersShouldNotBeIncludedInToken) {
   }
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcStrsepTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::strsep(nullptr, nullptr); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)
diff --git a/libc/test/src/string/strspn_test.cpp b/libc/test/src/string/strspn_test.cpp
@@ -85,11 +85,11 @@ TEST(LlvmLibcStrSpnTest, DuplicatedCharactersToBeSearchedForShouldStillMatch) {
   EXPECT_EQ(LIBC_NAMESPACE::strspn("aaaa", "aa"), size_t{4});
 }
 
-#ifdef LIBC_TARGET_OS_IS_LINUX
+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
 
 TEST(LlvmLibcStrSpnTest, CrashOnNullPtr) {
   ASSERT_DEATH([]() { LIBC_NAMESPACE::strspn(nullptr, nullptr); },
-               WITH_SIGNAL(SIGILL));
+               WITH_SIGNAL(SIGTRAP));
 }
 
 #endif // defined(LIBC_TARGET_OS_IS_LINUX)

Original file line number	Diff line number	Diff line change
`@@ -122,11 +122,11 @@ TEST(LlvmLibcMemChrTest, SignedCharacterFound) {`
`122`	`122`	`ASSERT_EQ(actual[0], c);`
`123`	`123`	`}`
`124`	`124`
`125`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`125`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`126`	`126`
`127`	`127`	`TEST(LlvmLibcMemChrTest, CrashOnNullPtr) {`
`128`	`128`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::memchr(nullptr, 1, 1); },`
`129`		`- WITH_SIGNAL(SIGILL));`
	`129`	`+ WITH_SIGNAL(SIGTRAP));`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`#endif // defined(LIBC_TARGET_OS_IS_LINUX)`
Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,11 @@ TEST(LlvmLibcMemcmpTest, SizeSweep) {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`69`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`70`	`70`
`71`	`71`	`TEST(LlvmLibcMemcmpTest, CrashOnNullPtr) {`
`72`	`72`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::memcmp(nullptr, nullptr, 1); },`
`73`		`- WITH_SIGNAL(SIGILL));`
	`73`	`+ WITH_SIGNAL(SIGTRAP));`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`#endif // defined(LIBC_TARGET_OS_IS_LINUX)`
Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,11 @@ TEST(LlvmLibcMemmoveTest, SizeSweep) {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`107`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`108`	`108`
`109`	`109`	`TEST(LlvmLibcMemmoveTest, CrashOnNullPtr) {`
`110`	`110`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::memmove(nullptr, nullptr, 0); },`
`111`		`- WITH_SIGNAL(SIGILL));`
	`111`	`+ WITH_SIGNAL(SIGTRAP));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`#endif // LIBC_TARGET_OS_IS_LINUX`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ TEST(LlvmLibcMempcpyTest, ZeroCount) {`
`27`	`27`	`ASSERT_EQ(static_cast<char *>(result), dest + 0);`
`28`	`28`	`}`
`29`	`29`
`30`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`30`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`31`	`31`
`32`	`32`	`TEST(LlvmLibcMempcpyTest, CrashOnNullPtr) {`
`33`	`33`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::mempcpy(nullptr, nullptr, 0); },`
`34`		`- WITH_SIGNAL(SIGILL));`
	`34`	`+ WITH_SIGNAL(SIGTRAP));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`#endif // defined(LIBC_TARGET_OS_IS_LINUX)`
Original file line number	Diff line number	Diff line change
`@@ -114,11 +114,11 @@ TEST(LlvmLibcMemRChrTest, ZeroLengthShouldReturnNullptr) {`
`114`	`114`	`ASSERT_STREQ(call_memrchr(src, 'd', 0), nullptr);`
`115`	`115`	`}`
`116`	`116`
`117`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`117`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`118`	`118`
`119`	`119`	`TEST(LlvmLibcMemRChrTest, CrashOnNullPtr) {`
`120`	`120`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::memrchr(nullptr, 'd', 1); },`
`121`		`- WITH_SIGNAL(SIGILL));`
	`121`	`+ WITH_SIGNAL(SIGTRAP));`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`#endif // defined(LIBC_TARGET_OS_IS_LINUX)`
Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ TEST_F(LlvmLibcStpncpyTest, CopyTwoWithNull) {`
`73`	`73`	`check_stpncpy(dst, src, 2, expected, 1);`
`74`	`74`	`}`
`75`	`75`
`76`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`76`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`77`	`77`
`78`	`78`	`TEST_F(LlvmLibcStpncpyTest, CrashOnNullPtr) {`
`79`	`79`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::stpncpy(nullptr, nullptr, 1); },`
`80`		`- WITH_SIGNAL(SIGILL));`
	`80`	`+ WITH_SIGNAL(SIGTRAP));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`#endif // defined(LIBC_TARGET_OS_IS_LINUX)`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,11 @@ TEST(LlvmLibcStrCatTest, NonEmptyDest) {`
`37`	`37`	`ASSERT_STREQ(dest, "xyzabc");`
`38`	`38`	`}`
`39`	`39`
`40`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`40`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`41`	`41`
`42`	`42`	`TEST(LlvmLibcStrCatTest, CrashOnNullPtr) {`
`43`	`43`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::strcat(nullptr, nullptr); },`
`44`		`- WITH_SIGNAL(SIGILL));`
	`44`	`+ WITH_SIGNAL(SIGTRAP));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`#endif // defined(LIBC_TARGET_OS_IS_LINUX)`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ TEST(LlvmLibcStrcollTest, SimpleTest) {`
`30`	`30`	`ASSERT_GT(result, 0);`
`31`	`31`	`}`
`32`	`32`
`33`		`-#ifdef LIBC_TARGET_OS_IS_LINUX`
	`33`	`+#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)`
`34`	`34`
`35`	`35`	`TEST(LlvmLibcStrcollTest, CrashOnNullPtr) {`
`36`	`36`	`ASSERT_DEATH([]() { LIBC_NAMESPACE::strcoll(nullptr, nullptr); },`
`37`		`- WITH_SIGNAL(SIGILL));`
	`37`	`+ WITH_SIGNAL(SIGTRAP));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`#endif // defined(LIBC_TARGET_OS_IS_LINUX)`