]> Savannah Git Hosting - gnulib.git/commitdiff
mbmemcasecmp tests: Renumber tests.
authorBruno Haible <bruno@clisp.org>
Sat, 29 Jul 2023 21:02:01 +0000 (23:02 +0200)
committerBruno Haible <bruno@clisp.org>
Sat, 29 Jul 2023 23:41:06 +0000 (01:41 +0200)
* tests/test-mbmemcasecmp*.sh: Renamed 1 -> 2 -> 3 -> 4.
* tests/test-mbmemcasecmp.c: Update.
* modules/mbmemcasecmp-tests: Update.

ChangeLog
modules/mbmemcasecmp-tests
tests/test-mbmemcasecmp-2.sh [new file with mode: 0755]
tests/test-mbmemcasecmp-3.sh [new file with mode: 0755]
tests/test-mbmemcasecmp-4.sh [new file with mode: 0755]
tests/test-mbmemcasecmp.c
tests/test-mbmemcasecmp1.sh [deleted file]
tests/test-mbmemcasecmp2.sh [deleted file]
tests/test-mbmemcasecmp3.sh [deleted file]

index 29b298d93187cfe200d390d5720332f4a57db538..a892d6a7a9b03430a41508db6ff1fc8c1f2bbe20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2023-07-29  Bruno Haible  <bruno@clisp.org>
 
+       mbmemcasecmp tests: Renumber tests.
+       * tests/test-mbmemcasecmp*.sh: Renamed 1 -> 2 -> 3 -> 4.
+       * tests/test-mbmemcasecmp.c: Update.
+       * modules/mbmemcasecmp-tests: Update.
+
        fnmatch tests: Renumber tests.
        * tests/test-fnmatch-w32-*.sh: Renamed 1 -> 2 -> 3 -> 5 -> 7 -> 4 -> 6
        -> 8.
index 52cb80def7056520053f3cda0c40a91f4454758b..06b20be337d200865bd5a3882e878ec716a89c9a 100644 (file)
@@ -1,7 +1,7 @@
 Files:
-tests/test-mbmemcasecmp1.sh
-tests/test-mbmemcasecmp2.sh
-tests/test-mbmemcasecmp3.sh
+tests/test-mbmemcasecmp-2.sh
+tests/test-mbmemcasecmp-3.sh
+tests/test-mbmemcasecmp-4.sh
 tests/test-mbmemcasecmp.c
 tests/test-mbmemcasecmp.h
 tests/macros.h
@@ -21,7 +21,7 @@ gt_LOCALE_FR_UTF8
 gt_LOCALE_TR_UTF8
 
 Makefile.am:
-TESTS += test-mbmemcasecmp1.sh test-mbmemcasecmp2.sh test-mbmemcasecmp3.sh
+TESTS += test-mbmemcasecmp-2.sh test-mbmemcasecmp-3.sh test-mbmemcasecmp-4.sh
 TESTS_ENVIRONMENT += \
   LOCALE_FR='@LOCALE_FR@' \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
diff --git a/tests/test-mbmemcasecmp-2.sh b/tests/test-mbmemcasecmp-2.sh
new file mode 100755 (executable)
index 0000000..c3f3c7f
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Test in an ISO-8859-1 or ISO-8859-15 locale.
+: "${LOCALE_FR=fr_FR}"
+if test $LOCALE_FR = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no traditional french locale is installed"
+  else
+    echo "Skipping test: no traditional french locale is supported"
+  fi
+  exit 77
+fi
+
+LC_ALL=$LOCALE_FR \
+${CHECKER} ./test-mbmemcasecmp${EXEEXT} 2
diff --git a/tests/test-mbmemcasecmp-3.sh b/tests/test-mbmemcasecmp-3.sh
new file mode 100755 (executable)
index 0000000..ada26e0
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Test whether a specific UTF-8 locale is installed.
+: "${LOCALE_FR_UTF8=fr_FR.UTF-8}"
+if test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french Unicode locale is installed"
+  else
+    echo "Skipping test: no french Unicode locale is supported"
+  fi
+  exit 77
+fi
+
+LC_ALL=$LOCALE_FR_UTF8 \
+${CHECKER} ./test-mbmemcasecmp${EXEEXT} 3
diff --git a/tests/test-mbmemcasecmp-4.sh b/tests/test-mbmemcasecmp-4.sh
new file mode 100755 (executable)
index 0000000..eb1747e
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Test whether a specific Turkish locale is installed.
+: "${LOCALE_TR_UTF8=tr_TR.UTF-8}"
+if test $LOCALE_TR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no turkish Unicode locale is installed"
+  else
+    echo "Skipping test: no turkish Unicode locale is supported"
+  fi
+  exit 77
+fi
+
+LC_ALL=$LOCALE_TR_UTF8 \
+${CHECKER} ./test-mbmemcasecmp${EXEEXT} 4
index f8ae91e401495bf5edcb79934c3659f92e16d93c..1e867924d439fdb105745f2adf0fe9550edc979c 100644 (file)
@@ -41,17 +41,17 @@ main (int argc, char *argv[])
   if (argc > 1)
     switch (argv[1][0])
       {
-      case '1':
+      case '2':
         /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
         test_iso_8859_1 (mbmemcasecmp, true);
         return 0;
 
-      case '2':
+      case '3':
         /* Locale encoding is UTF-8, locale is not Turkish.  */
         test_utf_8 (mbmemcasecmp, false);
         return 0;
 
-      case '3':
+      case '4':
         /* Locale encoding is UTF-8, locale is Turkish.  */
         test_utf_8 (mbmemcasecmp, true);
         return 0;
diff --git a/tests/test-mbmemcasecmp1.sh b/tests/test-mbmemcasecmp1.sh
deleted file mode 100755 (executable)
index af9ff76..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Test in an ISO-8859-1 or ISO-8859-15 locale.
-: "${LOCALE_FR=fr_FR}"
-if test $LOCALE_FR = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no traditional french locale is installed"
-  else
-    echo "Skipping test: no traditional french locale is supported"
-  fi
-  exit 77
-fi
-
-LC_ALL=$LOCALE_FR \
-${CHECKER} ./test-mbmemcasecmp${EXEEXT} 1
diff --git a/tests/test-mbmemcasecmp2.sh b/tests/test-mbmemcasecmp2.sh
deleted file mode 100755 (executable)
index 61d3214..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Test whether a specific UTF-8 locale is installed.
-: "${LOCALE_FR_UTF8=fr_FR.UTF-8}"
-if test $LOCALE_FR_UTF8 = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no french Unicode locale is installed"
-  else
-    echo "Skipping test: no french Unicode locale is supported"
-  fi
-  exit 77
-fi
-
-LC_ALL=$LOCALE_FR_UTF8 \
-${CHECKER} ./test-mbmemcasecmp${EXEEXT} 2
diff --git a/tests/test-mbmemcasecmp3.sh b/tests/test-mbmemcasecmp3.sh
deleted file mode 100755 (executable)
index b847774..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Test whether a specific Turkish locale is installed.
-: "${LOCALE_TR_UTF8=tr_TR.UTF-8}"
-if test $LOCALE_TR_UTF8 = none; then
-  if test -f /usr/bin/localedef; then
-    echo "Skipping test: no turkish Unicode locale is installed"
-  else
-    echo "Skipping test: no turkish Unicode locale is supported"
-  fi
-  exit 77
-fi
-
-LC_ALL=$LOCALE_TR_UTF8 \
-${CHECKER} ./test-mbmemcasecmp${EXEEXT} 3