From d555381e368d11c8cdbc6887a94920d718e25b1c Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 5 Apr 2009 01:24:45 -0400
Subject: [PATCH] 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
---
 Makefile.am                                          | 6 +++---
 cpio/test/CMakeLists.txt                             | 6 +++---
 cpio/test/{test_option_B.c => test_option_B_upper.c} | 0
 cpio/test/{test_option_L.c => test_option_L_upper.c} | 2 +-
 cpio/test/{test_option_ell.c => test_option_l.c}     | 8 +-------
 5 files changed, 8 insertions(+), 14 deletions(-)
 rename cpio/test/{test_option_B.c => test_option_B_upper.c} (100%)
 rename cpio/test/{test_option_L.c => test_option_L_upper.c} (99%)
 rename cpio/test/{test_option_ell.c => test_option_l.c} (92%)

diff --git a/Makefile.am b/Makefile.am
index f5815f817..193378032 100644
--- 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 0bd6094ea..aa223a160 100644
--- 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 595baf66a..db5f642c7 100644
--- 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 36bb0acc3..c6110fa02 100644
--- 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;
-- 
2.47.3