cp_clean:
- rm -rf cp_tests cp_*.{gnu,bb} cp
-cp_tests: cp_clean 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_w_a \
+ check_cp_dir_to_dir_w_a_take_two
+
+check_exists:
@echo;
@echo "No output from diff means busybox cp is functioning properly.";
@echo "Some tests might show timestamp differences that are Ok.";
@echo;
- ${BCP} || true;
+ @echo Verify that busybox cp exists;
+ @echo ------------------------------;
+ [ -x ${BCP} ] || exit 0
@echo;
mkdir cp_tests;
-\f # Copy a file to a copy of the file
+check_simple_cp:
+ @echo Copy a file to a copy of the file;
@echo ------------------------------;
cd cp_tests; \
echo A file > afile; \
@echo;
rm -rf cp_tests/*;
-\f # Copy a file pointed to by a symlink
- @echo; echo ------------------------------;
+check_cp_symlnk:
+ @echo; echo Copy a file pointed to by a symlink;
+ @echo ------------------------------;
cd cp_tests; \
mkdir here there; \
echo A file > afile; \
@echo;
rm -rf cp_tests/*
-\f # Copy a symlink, useing the -a switch.
- @echo; echo ------------------------------;
+check_cp_symlink_w_a:
+ @echo; echo Copy a symlink, useing the -a switch.;
+ @echo ------------------------------;
cd cp_tests; \
echo A file > afile; \
mkdir here there; \
cd here; \
ln -s ../afile .
- cd cp_test; \
+ cd cp_tests; \
ls -lR . > ../cp_a_symlink.gnu; \
${GCP} -a here/afile there; \
ls -lR . >> ../cp_a_symlink.gnu;
@echo;
- rm -f cp_tests/there/*;
+ rm -rf cp_tests/there/*;
sleep 1;
@echo;
diff -u cp_a_symlink.gnu cp_a_symlink.bb;
- @echo;
- rm -f cp_tests/*;
-
-\f # Copy a directory into another directory with the -a switch
- @echo; echo ------------------------------;
- cd cp_tests; \
- mkdir here there; \
- echo A file > here/afile; \
- mkdir here/adir; \
- touch here/adir/afileinadir; \
- ln -s $$(pwd) here/alink;
-
- @echo;
- cd cp_tests; \
- ls -lR . > ../cp_a_dir_dir.gnu; \
- ${GCP} -a here/ there/; \
- ls -lR . >> ../cp_a_dir_dir.gnu;
-
- @echo;
- rm -rf cp_tests/there/*;
-
- sleep 1;
-
- @echo;
- cd cp_tests; \
- ls -lR . > ../cp_a_dir_dir.bb; \
- ${BCP} -a here/ there/; \
- ls -lR . >> ../cp_a_dir_dir.bb;
-
- @echo;
- diff -u cp_a_dir_dir.gnu cp_a_dir_dir.bb;
-
@echo;
rm -rf cp_tests/*;
-\f # Copy a set of files to a directory.
- @echo; echo ------------------------------;
+
+check_cp_files_to_dir:
+ # Copy a set of files to a directory.
+ @echo; echo Copy a set of files to a directory.;
+ @echo ------------------------------;
cd cp_tests; \
echo A file number one > afile1; \
echo A file number two, blah. > afile2; \
@echo;
rm -rf cp_tests/*;
-\f # Copy a set of files to a directory with the -d switch.
- @echo; echo ------------------------------;
+check_cp_files_to_dir_w_d:
+ # Copy a set of files to a directory with the -d switch.
+ @echo; echo Copy a set of files to a directory with the -d switch.;
+ @echo ------------------------------;
cd cp_tests; \
echo A file number one > afile1; \
echo A file number two, blah. > afile2; \
@echo;
rm -rf cp_tests/{afile{1,2},symlink1,there1};
-\f # Copy a set of files to a directory with the -p switch.
- @echo; echo ------------------------------;
+check_cp_files_to_dir_w_p:
+ # Copy a set of files to a directory with the -p switch.
+ @echo; echo Copy a set of files to a directory with the -p switch.;
+ @echo ------------------------------;
cd cp_tests; \
echo A file number one > afile1; \
echo A file number two, blah. > afile2; \
@echo;
rm -rf cp_tests/{afile{1,2},symlink1,there1};
-\f # Copy a set of files to a directory with -p and -d switches.
- @echo; echo ------------------------------;
+
+check_cp_files_to_dir_w_p_and_d:
+ @echo; echo Copy a set of files to a directory with -p and -d switches.
+ @echo ------------------------------;
cd cp_tests; \
echo A file number one > afile1; \
echo A file number two, blah. > afile2; \
@echo;
rm -rf cp_tests/{afile{1,2},symlink1,there1};
-\f # Copy a directory into another directory with the -a switch.
- @echo; echo ------------------------------;
+# 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.
+ @echo ------------------------------;
+ @echo There should be an error message about cannot cp a dir to a subdir of itself.
+ cd cp_tests; \
+ touch a b c; \
+ mkdir adir; \
+ ls -lR . > ../cp_a_star_adir.gnu; \
+ ${GCP} -a * adir; \
+ ls -lR . >> ../cp_a_star_adir.gnu;
+
+ @echo
+ @echo There should be an error message about cannot cp a dir to a subdir of itself.
+ cd cp_tests; \
+ rm -rf adir; \
+ mkdir adir; \
+ ls -lR . > ../cp_a_star_adir.bb; \
+ ${BCP} -a * adir; \
+ ls -lR . >> ../cp_a_star_adir.bb;
+
+ @echo;
+ diff -u cp_a_star_adir.gnu cp_a_star_adir.bb;
+
+ # Done
+ @echo;
+ rm -rf cp_tests;
+ @echo; echo Done.
+
+
+check_cp_dir_to_dir_w_a:
+ @echo; echo Copy a directory into another directory with the -a switch.
+ @echo ------------------------------;
cd cp_tests; \
mkdir dir{a,b}; \
echo A file > dira/afile; \
@echo;
rm -rf cp_tests/dir{a,b};
-\f # Copy a directory to another directory, without the -a switch.
- @echo; echo ------------------------------;
- @echo There should be an error message about cannot cp a dir to a subdir of itself.
- cd cp_tests; \
- touch a b c; \
- mkdir adir; \
- ls -lR . > ../cp_a_star_adir.gnu; \
- ${GCP} -a * adir; \
- ls -lR . >> ../cp_a_star_adir.gnu;
- @echo
- @echo There should be an error message about cannot cp a dir to a subdir of itself.
- cd cp_tests; \
- rm -rf adir; \
- mkdir adir; \
- ls -lR . > ../cp_a_star_adir.bb; \
- ${BCP} -a * adir; \
- ls -lR . >> ../cp_a_star_adir.bb;
+check_cp_dir_to_dir_w_a_take_two:
+ @echo; echo Copy a directory into another directory with the -a switch;
+ @echo ------------------------------;
+ mkdir -p cp_tests/gnu; \
+ mkdir -p cp_tests/bb; \
+ cd cp_tests; \
+ mkdir here there; \
+ echo A file > here/afile; \
+ mkdir here/adir; \
+ touch here/adir/afileinadir; \
+ ln -s $$(pwd) here/alink;
@echo;
- diff -u cp_a_star_adir.gnu cp_a_star_adir.bb;
-\f
+ cd cp_tests/gnu; \
+ ls -lR . > ../../cp_a_dir_dir.gnu; \
+ ${GCP} -a here/ there/; \
+ ls -lR . >> ../../cp_a_dir_dir.gnu;
+
@echo;
- rm -rf cp_tests;
- @echo; echo Done.
+ rm -rf cp_tests/there/*;
+
+ sleep 1;
+
+ @echo;
+ cd cp_tests/bb; \
+ ls -lR . > ../../cp_a_dir_dir.bb; \
+ ${BCP} -a here/ there/; \
+ ls -lR . >> ../../cp_a_dir_dir.bb;
+
+ @echo;
+ echo "Erik 1"
+ diff -u cp_a_dir_dir.gnu cp_a_dir_dir.bb;
+ echo "Erik 2"
+
+ @echo;
+ echo "Erik 3"
+ rm -rf cp_tests/*;
+
+
projects / oweals / busybox.git / blobdiff