Test suite update from Larry Doolittle to disable some problematic

ambiguous cases.  Everything now passes the test suite...

2 files changed, 10 insertions, 3 deletions

diff --git a/tests/cp_tests.mk b/tests/cp_tests.mk
index f6e6c0df7..b96c5cea6 100644
--- a/tests/cp_tests.mk
+++ b/tests/cp_tests.mk
@@ -14,10 +14,11 @@ clean:: cp_clean
 cp_clean:
         - rm -rf cp_tests cp_*.{gnu,bb} cp
 
+# check_cp_dir_to_dir_wo_a removed from this list; see below
 cp_tests: cp_clean cp check_exists check_simple_cp check_cp_symlnk \
         check_cp_symlink_w_a check_cp_files_to_dir check_cp_files_to_dir_w_d \
         check_cp_files_to_dir_w_p check_cp_files_to_dir_w_p_and_d \
-        check_cp_dir_to_dir_wo_a check_cp_dir_to_dir_w_a \
+        check_cp_dir_to_dir_w_a \
         check_cp_dir_to_dir_w_a_take_two
 
 check_exists:
@@ -247,6 +248,11 @@ check_cp_files_to_dir_w_p_and_d:
         @echo;
         rm -rf cp_tests/{afile{1,2},symlink1,there1};
 
+# This test doesn't work any more; gnu cp now _does_ copy a directory
+# to a subdirectory of itself.  What's worse, that "feature" has no
+# (documented) way to be disabled with command line switches.
+# It's not obvious that busybox cp should mimic this behavior.
+# For now, this test is removed from the cp_tests list, above.
 check_cp_dir_to_dir_wo_a:
         # Copy a directory to another directory, without the -a switch.
         @echo; echo Copy a directory to another directory, without the -a switch.
diff --git a/tests/mv_tests.mk b/tests/mv_tests.mk
index 81b8ffdec..f03e08a73 100644
--- a/tests/mv_tests.mk
+++ b/tests/mv_tests.mk
@@ -144,8 +144,8 @@ mv_tests: mv_clean mv
         @echo; echo ------------------------------;
         @echo There should be an error message about cannot mv a dir to a subdir of itself.
         cd mv_tests;                            \
-         touch a b c;                           \
          mkdir adir;                            \
+         touch -r . a b c adir;                 \
          ls -lR . > ../mv_a_star_adir.gnu;      \
          ${GMV} * adir;                         \
          ls -lR . >> ../mv_a_star_adir.gnu;
@@ -153,8 +153,9 @@ mv_tests: mv_clean mv
         @echo
         @echo There should be an error message about cannot mv a dir to a subdir of itself.
         cd mv_tests;                            \
-         rm -rf adir;                           \
+         rm -rf a b c adir;                     \
          mkdir adir;                            \
+         touch -r . a b c adir;                 \
          ls -lR . > ../mv_a_star_adir.bb;       \
          ${BMV} * adir;                 \
          ls -lR . >> ../mv_a_star_adir.bb;