From: Bruno Haible Date: Sat, 18 Feb 2023 11:08:33 +0000 (+0100) Subject: unilbrk tests: Fix compilation failures (regression 2023-02-11). X-Git-Tag: v1.0~1669 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=1e29238e40d118d4f769f7516700dd4fc494bfcd;p=gnulib.git unilbrk tests: Fix compilation failures (regression 2023-02-11). * tests/unilbrk/test-u8-possible-linebreaks.c (main): Outside of libunistring, don't test the backward compatibility function. * tests/unilbrk/test-u16-possible-linebreaks.c (main): Likewise. * tests/unilbrk/test-u32-possible-linebreaks.c (main): Likewise. * tests/unilbrk/test-ulc-possible-linebreaks.c (main): Likewise. * tests/unilbrk/test-u8-width-linebreaks.c (main): Likewise. * tests/unilbrk/test-u16-width-linebreaks.c (main): Likewise. * tests/unilbrk/test-u32-width-linebreaks.c (main): Likewise. * tests/unilbrk/test-ulc-width-linebreaks.c (main): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 8352cda04a..269871c4c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2023-02-18 Bruno Haible + + unilbrk tests: Fix compilation failures (regression 2023-02-11). + * tests/unilbrk/test-u8-possible-linebreaks.c (main): Outside of + libunistring, don't test the backward compatibility function. + * tests/unilbrk/test-u16-possible-linebreaks.c (main): Likewise. + * tests/unilbrk/test-u32-possible-linebreaks.c (main): Likewise. + * tests/unilbrk/test-ulc-possible-linebreaks.c (main): Likewise. + * tests/unilbrk/test-u8-width-linebreaks.c (main): Likewise. + * tests/unilbrk/test-u16-width-linebreaks.c (main): Likewise. + * tests/unilbrk/test-u32-width-linebreaks.c (main): Likewise. + * tests/unilbrk/test-ulc-width-linebreaks.c (main): Likewise. + 2023-02-17 Bruno Haible Improve cross-compilation for midipix. diff --git a/tests/unilbrk/test-u16-possible-linebreaks.c b/tests/unilbrk/test-u16-possible-linebreaks.c index 63207b5805..5d72227350 100644 --- a/tests/unilbrk/test-u16-possible-linebreaks.c +++ b/tests/unilbrk/test-u16-possible-linebreaks.c @@ -255,8 +255,10 @@ int main () { test_function (u16_possible_linebreaks, 2); -#undef u16_possible_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef u16_possible_linebreaks test_function (u16_possible_linebreaks, 1); +#endif return 0; } diff --git a/tests/unilbrk/test-u16-width-linebreaks.c b/tests/unilbrk/test-u16-width-linebreaks.c index 3a38419bae..e59e4744b4 100644 --- a/tests/unilbrk/test-u16-width-linebreaks.c +++ b/tests/unilbrk/test-u16-width-linebreaks.c @@ -76,8 +76,10 @@ int main () { test_function (u16_width_linebreaks, 2); -#undef u16_width_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef u16_width_linebreaks test_function (u16_width_linebreaks, 1); +#endif return 0; } diff --git a/tests/unilbrk/test-u32-possible-linebreaks.c b/tests/unilbrk/test-u32-possible-linebreaks.c index bb99ec5752..203fed0c89 100644 --- a/tests/unilbrk/test-u32-possible-linebreaks.c +++ b/tests/unilbrk/test-u32-possible-linebreaks.c @@ -255,8 +255,10 @@ int main () { test_function (u32_possible_linebreaks, 2); -#undef u32_possible_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef u32_possible_linebreaks test_function (u32_possible_linebreaks, 1); +#endif return 0; } diff --git a/tests/unilbrk/test-u32-width-linebreaks.c b/tests/unilbrk/test-u32-width-linebreaks.c index 79b7222ad7..b64989e895 100644 --- a/tests/unilbrk/test-u32-width-linebreaks.c +++ b/tests/unilbrk/test-u32-width-linebreaks.c @@ -76,8 +76,10 @@ int main () { test_function (u32_width_linebreaks, 2); -#undef u32_width_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef u32_width_linebreaks test_function (u32_width_linebreaks, 1); +#endif return 0; } diff --git a/tests/unilbrk/test-u8-possible-linebreaks.c b/tests/unilbrk/test-u8-possible-linebreaks.c index ac0abadc4a..a5b533a31a 100644 --- a/tests/unilbrk/test-u8-possible-linebreaks.c +++ b/tests/unilbrk/test-u8-possible-linebreaks.c @@ -238,8 +238,10 @@ int main () { test_function (u8_possible_linebreaks, 2); -#undef u8_possible_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef u8_possible_linebreaks test_function (u8_possible_linebreaks, 1); +#endif return 0; } diff --git a/tests/unilbrk/test-u8-width-linebreaks.c b/tests/unilbrk/test-u8-width-linebreaks.c index d1d8ae9139..967d238d8d 100644 --- a/tests/unilbrk/test-u8-width-linebreaks.c +++ b/tests/unilbrk/test-u8-width-linebreaks.c @@ -70,8 +70,10 @@ int main () { test_function (u8_width_linebreaks, 2); -#undef u8_width_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef u8_width_linebreaks test_function (u8_width_linebreaks, 1); +#endif return 0; } diff --git a/tests/unilbrk/test-ulc-possible-linebreaks.c b/tests/unilbrk/test-ulc-possible-linebreaks.c index 9cd8b0d727..1d80af10ee 100644 --- a/tests/unilbrk/test-ulc-possible-linebreaks.c +++ b/tests/unilbrk/test-ulc-possible-linebreaks.c @@ -71,8 +71,10 @@ int main () { test_function (ulc_possible_linebreaks, 2); -#undef ulc_possible_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef ulc_possible_linebreaks test_function (ulc_possible_linebreaks, 1); +#endif return 0; } diff --git a/tests/unilbrk/test-ulc-width-linebreaks.c b/tests/unilbrk/test-ulc-width-linebreaks.c index e9c4fa23df..415a96fd44 100644 --- a/tests/unilbrk/test-ulc-width-linebreaks.c +++ b/tests/unilbrk/test-ulc-width-linebreaks.c @@ -55,8 +55,10 @@ int main () { test_function (ulc_width_linebreaks, 2); -#undef ulc_width_linebreaks +#ifdef IN_LIBUNISTRING_GNULIB_TESTS +# undef ulc_width_linebreaks test_function (ulc_width_linebreaks, 1); +#endif return 0; }