wcsnrtombs tests: Renumber tests.

* tests/test-wcsnrtombs*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5.
* tests/test-wcsnrtombs.c: Update.
* modules/wcsnrtombs-tests: Update.

diff --git a/ChangeLog b/ChangeLog
index 4a26a9919481c4fbf24d0fb70bd4e4e7c2a77af2..20c46a6d1817501f5e440436f5ce160280016978 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2023-07-29  Bruno Haible  <bruno@clisp.org>
 
+       wcsnrtombs tests: Renumber tests.
+       * tests/test-wcsnrtombs*.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5.
+       * tests/test-wcsnrtombs.c: Update.
+       * modules/wcsnrtombs-tests: Update.
+
        wcrtomb tests: Renumber tests.
        * tests/test-wcrtomb.sh: Renamed 1 -> 2 -> 3 -> 4 -> 5 -> 1.
        * tests/test-wcrtomb.c: Update.

diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests
index 6ddd43a27ea488b853741d358104d2a7eadbbff9..04ec77eff669ca2cde0bd69b07d66abd457e1326 100644 (file)
--- a/modules/wcsnrtombs-tests
+++ b/modules/wcsnrtombs-tests
@@ -1,8 +1,8 @@
 Files:
-tests/test-wcsnrtombs1.sh
-tests/test-wcsnrtombs2.sh
-tests/test-wcsnrtombs3.sh
-tests/test-wcsnrtombs4.sh
+tests/test-wcsnrtombs-2.sh
+tests/test-wcsnrtombs-3.sh
+tests/test-wcsnrtombs-4.sh
+tests/test-wcsnrtombs-5.sh
 tests/test-wcsnrtombs.c
 tests/signature.h
 tests/macros.h
@@ -21,7 +21,9 @@ gt_LOCALE_JA
 gt_LOCALE_ZH_CN
 
 Makefile.am:
-TESTS += test-wcsnrtombs1.sh test-wcsnrtombs2.sh test-wcsnrtombs3.sh test-wcsnrtombs4.sh
+TESTS += \
+  test-wcsnrtombs-2.sh test-wcsnrtombs-3.sh test-wcsnrtombs-4.sh \
+  test-wcsnrtombs-5.sh
 TESTS_ENVIRONMENT += \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \

diff --git a/tests/test-wcsnrtombs1.sh b/tests/test-wcsnrtombs-2.sh
similarity index 89%
rename from tests/test-wcsnrtombs1.sh
rename to tests/test-wcsnrtombs-2.sh
index 0468a68221d36f9ad3da03705ac50c3781ffe56f..ec4e27d86d2000398e36489c783eef8b1c8cfe30 100755 (executable)
--- a/tests/test-wcsnrtombs1.sh
+++ b/tests/test-wcsnrtombs-2.sh
@@ -12,4 +12,4 @@ if test $LOCALE_FR = none; then
 fi
 
 LC_ALL=$LOCALE_FR \
-${CHECKER} ./test-wcsnrtombs${EXEEXT} 1
+${CHECKER} ./test-wcsnrtombs${EXEEXT} 2

diff --git a/tests/test-wcsnrtombs2.sh b/tests/test-wcsnrtombs-3.sh
similarity index 89%
rename from tests/test-wcsnrtombs2.sh
rename to tests/test-wcsnrtombs-3.sh
index 206679439874ac6fd7ced5d1bf9f3dd66ef06542..414a43ec89e6e3f30d2b1c0ee4a3fe33ad2374ea 100755 (executable)
--- a/tests/test-wcsnrtombs2.sh
+++ b/tests/test-wcsnrtombs-3.sh
@@ -12,4 +12,4 @@ if test $LOCALE_FR_UTF8 = none; then
 fi
 
 LC_ALL=$LOCALE_FR_UTF8 \
-${CHECKER} ./test-wcsnrtombs${EXEEXT} 2
+${CHECKER} ./test-wcsnrtombs${EXEEXT} 3

diff --git a/tests/test-wcsnrtombs3.sh b/tests/test-wcsnrtombs-4.sh
similarity index 89%
rename from tests/test-wcsnrtombs3.sh
rename to tests/test-wcsnrtombs-4.sh
index 1b67da7fb5d594ee6b162a2b014c9583e04e6e75..a0277b4ceeee4714e4e3c1e4c0a5fdcf13c00b51 100755 (executable)
--- a/tests/test-wcsnrtombs3.sh
+++ b/tests/test-wcsnrtombs-4.sh
@@ -12,4 +12,4 @@ if test $LOCALE_JA = none; then
 fi
 
 LC_ALL=$LOCALE_JA \
-${CHECKER} ./test-wcsnrtombs${EXEEXT} 3
+${CHECKER} ./test-wcsnrtombs${EXEEXT} 4

diff --git a/tests/test-wcsnrtombs4.sh b/tests/test-wcsnrtombs-5.sh
similarity index 90%
rename from tests/test-wcsnrtombs4.sh
rename to tests/test-wcsnrtombs-5.sh
index c7759505ac68511ce33d320f2f1ae7d8991e0db8..da76f687a7570e44c019dc46e81411e851724ddb 100755 (executable)
--- a/tests/test-wcsnrtombs4.sh
+++ b/tests/test-wcsnrtombs-5.sh
@@ -12,4 +12,4 @@ if test $LOCALE_ZH_CN = none; then
 fi
 
 LC_ALL=$LOCALE_ZH_CN \
-${CHECKER} ./test-wcsnrtombs${EXEEXT} 4
+${CHECKER} ./test-wcsnrtombs${EXEEXT} 5

diff --git a/tests/test-wcsnrtombs.c b/tests/test-wcsnrtombs.c
index 440d7c5edd3fdaa0f672bfd38997382e714d472e..d9d9178c33517e5eae16217a472432056d20af10 100644 (file)
--- a/tests/test-wcsnrtombs.c
+++ b/tests/test-wcsnrtombs.c
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
 
       switch (argv[1][0])
         {
-        case '1':
+        case '2':
           /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
           {
             const char original[] = "B\374\337er"; /* "Büßer" */
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
           }
           break;
 
-        case '2':
+        case '3':
           /* Locale encoding is UTF-8.  */
           {
             const char original[] = "B\303\274\303\237er"; /* "Büßer" */
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
           }
           break;
 
-        case '3':
+        case '4':
           /* Locale encoding is EUC-JP.  */
           {
             const char original[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
@@ -156,7 +156,7 @@ main (int argc, char *argv[])
           break;
 
 
-        case '4':
+        case '5':
           /* Locale encoding is GB18030.  */
           {
             const char original[] = "B\250\271\201\060\211\070er"; /* "Büßer" */