From 5f761f2e1530ce39fb9429d9a93cddfc28439025 Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 11 Apr 2010 22:11:28 -0400
Subject: [PATCH] --keep-newer-files is the correct option name.

SVN-Revision: 2243
---
 Makefile.am                                            |  2 +-
 tar/test/CMakeLists.txt                                |  2 +-
 ...ion_keep_newer.c => test_option_keep_newer_files.c} | 10 +++++-----
 ...ewer.tgz.uu => test_option_keep_newer_files.tgz.uu} |  0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename tar/test/{test_option_keep_newer.c => test_option_keep_newer_files.c} (88%)
 rename tar/test/{test_option_keep_newer.tgz.uu => test_option_keep_newer_files.tgz.uu} (100%)

diff --git a/Makefile.am b/Makefile.am
index 330ebf423..9ab3f7e0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,7 +493,7 @@ bsdtar_test_SOURCES=						\
 	tar/test/test_option_b.c				\
 	tar/test/test_option_exclude.c				\
 	tar/test/test_option_k.c				\
-	tar/test/test_option_keep_newer.c			\
+	tar/test/test_option_keep_newer_files.c			\
 	tar/test/test_option_q.c				\
 	tar/test/test_option_r.c				\
 	tar/test/test_option_s.c				\
diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index d38dcdacb..9b422f70e 100644
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -24,7 +24,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_option_b.c
     test_option_exclude.c
     test_option_k.c
-    test_option_keep_newer.c
+    test_option_keep_newer_files.c
     test_option_q.c
     test_option_r.c
     test_option_s.c
diff --git a/tar/test/test_option_keep_newer.c b/tar/test/test_option_keep_newer_files.c
similarity index 88%
rename from tar/test/test_option_keep_newer.c
rename to tar/test/test_option_keep_newer_files.c
index 3062587d0..20c2a149e 100644
--- a/tar/test/test_option_keep_newer.c
+++ b/tar/test/test_option_keep_newer_files.c
@@ -25,14 +25,14 @@
 #include "test.h"
 __FBSDID("$FreeBSD$");
 
-DEFINE_TEST(test_option_keep_newer)
+DEFINE_TEST(test_option_keep_newer_files)
 {
-	const char *reffile = "test_option_keep_newer.tgz";
+	const char *reffile = "test_option_keep_newer_files.tgz";
 
 	/* Reference file has one entry "file" with a very old timestamp. */
 	extract_reference_file(reffile);
 
-	/* Test 1: Without --keep-newer */
+	/* Test 1: Without --keep-newer-files */
 	assertMakeDir("test1", 0755);
 	assertChdir("test1");
 	assertMakeFile("file", 0644, "new");
@@ -43,12 +43,12 @@ DEFINE_TEST(test_option_keep_newer)
 	assertEmptyFile("test.err");
 	assertChdir("..");
 
-	/* Test 2: With --keep-newer */
+	/* Test 2: With --keep-newer-files */
 	assertMakeDir("test2", 0755);
 	assertChdir("test2");
 	assertMakeFile("file", 0644, "new");
 	assertEqualInt(0,
-	    systemf("%s -xf ../%s --keep-newer >test.out 2>test.err", testprog, reffile));
+	    systemf("%s -xf ../%s --keep-newer-files >test.out 2>test.err", testprog, reffile));
 	assertFileContents("new", 3, "file");
 	assertEmptyFile("test.out");
 	assertEmptyFile("test.err");
diff --git a/tar/test/test_option_keep_newer.tgz.uu b/tar/test/test_option_keep_newer_files.tgz.uu
similarity index 100%
rename from tar/test/test_option_keep_newer.tgz.uu
rename to tar/test/test_option_keep_newer_files.tgz.uu
-- 
2.47.3