From 5e42576c017905627e209acc20bf6e6abd1db6ef Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 25 Oct 2006 00:01:33 +0200 Subject: new feature: rm accepts new option: --one-file-system Suggested by Steve McIntyre in . * src/remove.h (struct rm_options) [one_file_system]: New member. * src/rm.c (rm_option_init): Initialize it. (usage): Document the option. * src/mv.c (rm_option_init): Likewise. * src/remove.c (remove_dir): With --one-file-system and --recursive, for each directory command line argument, do not affect a file system different from that of the starting directory. And give a diagnostic. * src/rm.c (ONE_FILE_SYSTEM): New enum. (main): Handle new option. * tests/rm/one-file-system: Test the above. * tests/rm/Makefile.am (TESTS): Add one-file-system. * tests/Makefile.am (check-root): Add the rm/one-file-system test to the list. (EXTRA_DIST): Add other-fs-tmpdir. * tests/mv/setup: Removed. Renamed to... * tests/other-fs-tmpdir: ...this new file. * tests/mv/Makefile.am (EXTRA_DIST): Remove setup. * tests/mv/acl: Reflect renaming: use ../other-fs-tmpdir. * tests/mv/backup-is-src: Likewise. * tests/mv/hard-link-1: Likewise. * tests/mv/leak-fd: Likewise. * tests/mv/mv-special-1: Likewise. * tests/mv/part-fail: Likewise. * tests/mv/part-hardlink: Likewise. * tests/mv/part-rename: Likewise. * tests/mv/part-symlink: Likewise. * tests/mv/partition-perm: Likewise. * tests/mv/to-symlink: Likewise. * tests/mv/into-self-2: Likewise. [doc/ChangeLog] * coreutils.texi (rm invocation): Describe --one-file-system. --- tests/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index b13294bf5..d173ecda9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,7 +15,8 @@ TESTS_ENVIRONMENT = \ EXTRA_DIST = \ $(TESTS) Coreutils.pm Makefile.am.in README acl envvar-check \ - expensive group-names input-tty lang-default mk-script priv-check \ + expensive group-names input-tty lang-default mk-script \ + other-fs-tmpdir priv-check \ rwx-to-mode sample-test setgid-check sparse-file \ umask-check very-expensive @@ -28,8 +29,9 @@ SUBDIRS = \ tsort unexpand uniq wc ## N O T E :: Please do not add new directories. -.PHONY: check-root t1 t2 t3 t4 t5 -check-root: t1 t2 t3 t4 t5 +all_t = t1 t2 t3 t4 t5 t6 +.PHONY: check-root $(all_t) +check-root: $(all_t) t1: cd chown && $(MAKE) check TESTS=basic @@ -41,6 +43,8 @@ t4: cd rm && $(MAKE) check TESTS=fail-2eperm t5: cd tail-2 && $(MAKE) check TESTS=append-only +t6: + cd rm && $(MAKE) check TESTS=one-file-system check-recursive: root-hint -- cgit v1.2.3-54-g00ecf