*BSD: disable the problematic bytes_to_str() test properly

generalmimon · generalmimon · commit 569b9257bd27 · 2025-03-02T15:53:44.000+01:00
This allows us to see that this test was skipped.
diff --git a/tests/unittest.cpp b/tests/unittest.cpp
@@ -510,8 +510,11 @@ TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_gb2312_too_short)
     }
 }
 
-#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+TEST(KaitaiStreamTest, DISABLED_bytes_to_str_invalid_seq_gb2312_two_bytes)
+#else
 TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_gb2312_two_bytes)
+#endif
 {
     // 0xB0 0x30 is illegal sequence in GB2312: 0xB0 must be followed by [0xA1..0xFE].
     // However, some iconv engines, namely CITRUS integrated with modern FreeBSD (10+) and NetBSD,
@@ -529,7 +532,6 @@ TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_gb2312_two_bytes)
 #endif
     }
 }
-#endif
 
 TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_utf16le_odd_bytes)
 {

Original file line number	Diff line number	Diff line change
`@@ -510,8 +510,11 @@ TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_gb2312_too_short)`
`510`	`510`	`}`
`511`	`511`	`}`
`512`	`512`
`513`		`-#if !defined(__FreeBSD__) && !defined(__NetBSD__)`
	`513`	`+#if defined(__FreeBSD__) \|\| defined(__NetBSD__)`
	`514`	`+TEST(KaitaiStreamTest, DISABLED_bytes_to_str_invalid_seq_gb2312_two_bytes)`
	`515`	`+#else`
`514`	`516`	`TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_gb2312_two_bytes)`
	`517`	`+#endif`
`515`	`518`	`{`
`516`	`519`	`// 0xB0 0x30 is illegal sequence in GB2312: 0xB0 must be followed by [0xA1..0xFE].`
`517`	`520`	`// However, some iconv engines, namely CITRUS integrated with modern FreeBSD (10+) and NetBSD,`
`@@ -529,7 +532,6 @@ TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_gb2312_two_bytes)`
`529`	`532`	`#endif`
`530`	`533`	`}`
`531`	`534`	`}`
`532`		`-#endif`
`533`	`535`
`534`	`536`	`TEST(KaitaiStreamTest, bytes_to_str_invalid_seq_utf16le_odd_bytes)`
`535`	`537`	`{`