Rename the tests to a consistent style:

  Test for -L = test_option_L_upper
  Test for -B = test_option_B_upper
  Test for -l = test_option_l
This should be reasonably legible and be sane
on case-insensitive systems.

SVN-Revision: 926

diff --git a/Makefile.am b/Makefile.am
index f5815f817ac312526c35c2aef95c85f949bd3313..1933780324736a7a311d2c650be373e7a4d761ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -512,15 +512,15 @@ bsdcpio_test_SOURCES=                                             \
        cpio/test/test_cmdline.c                                \
        cpio/test/test_format_newc.c                            \
        cpio/test/test_gcpio_compat.c                           \
-       cpio/test/test_option_B.c                               \
+       cpio/test/test_option_B_upper.c                         \
        cpio/test/test_option_C_upper.c                         \
-       cpio/test/test_option_L.c                               \
+       cpio/test/test_option_L_upper.c                         \
        cpio/test/test_option_a.c                               \
        cpio/test/test_option_c.c                               \
        cpio/test/test_option_d.c                               \
-       cpio/test/test_option_ell.c                             \
        cpio/test/test_option_f.c                               \
        cpio/test/test_option_help.c                            \
+       cpio/test/test_option_l.c                               \
        cpio/test/test_option_m.c                               \
        cpio/test/test_option_t.c                               \
        cpio/test/test_option_u.c                               \

diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt
index 0bd6094ea51d0e735becf0419af0ca572ae07821..aa223a160e78fa7ccdd9a470eea8ea3a66a65da3 100644 (file)
--- a/cpio/test/CMakeLists.txt
+++ b/cpio/test/CMakeLists.txt
@@ -15,15 +15,15 @@ IF(ENABLE_CPIO AND ENABLE_TEST)
     test_cmdline.c
     test_format_newc.c
     test_gcpio_compat.c
-    test_option_B.c
+    test_option_B_upper.c
     test_option_C_upper.c
-    test_option_L.c
+    test_option_L_upper.c
     test_option_a.c
     test_option_c.c
     test_option_d.c
-    test_option_ell.c
     test_option_f.c
     test_option_help.c
+    test_option_l.c
     test_option_m.c
     test_option_t.c
     test_option_u.c

diff --git a/cpio/test/test_option_B.c b/cpio/test/test_option_B_upper.c
similarity index 100%
rename from cpio/test/test_option_B.c
rename to cpio/test/test_option_B_upper.c

diff --git a/cpio/test/test_option_L.c b/cpio/test/test_option_L_upper.c
similarity index 99%
rename from cpio/test/test_option_L.c
rename to cpio/test/test_option_L_upper.c
index 595baf66ae1fa9d974c2ab4368137af08cc2bcb8..db5f642c7264a7858442e6fd4ec14a095ded8daf 100644 (file)
--- a/cpio/test/test_option_L.c
+++ b/cpio/test/test_option_L_upper.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_L.c,v 1.2 2008/08/24 06:21
 #define CAT "cat"
 #endif
 
-DEFINE_TEST(test_option_L)
+DEFINE_TEST(test_option_L_upper)
 {
        struct stat st;
        int fd, filelist;

diff --git a/cpio/test/test_option_ell.c b/cpio/test/test_option_l.c
similarity index 92%
rename from cpio/test/test_option_ell.c
rename to cpio/test/test_option_l.c
index 36bb0acc350b4815475d9f6990648c80bdf5b11c..c6110fa025627f28bfa023779045f3e54e2ee15f 100644 (file)
--- a/cpio/test/test_option_ell.c
+++ b/cpio/test/test_option_l.c
@@ -25,13 +25,7 @@
 #include "test.h"
 __FBSDID("$FreeBSD$");
 
-/*
- * This is called "test_option_ell" instead of "test_option_l" to
- * avoid any conflicts with "test_option_L" on case-insensitive
- * filesystems.
- */
-
-DEFINE_TEST(test_option_ell)
+DEFINE_TEST(test_option_l)
 {
        struct stat st, st2;
        int fd;