diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-09-02 21:55:12 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-09-05 08:48:29 +0200 |
| commit | 21b5147fd8ee493727e2a3ca17b3bf695c5024d3 (patch) | |
| tree | b14cc2e5d51d761e9c825e0c0dd56f7fdce85cea | |
| parent | 24fb6d91b6b5b460d5d0b4f5c76d4a954f928040 (diff) | |
| download | coreutils-21b5147fd8ee493727e2a3ca17b3bf695c5024d3.tar.gz coreutils-21b5147fd8ee493727e2a3ca17b3bf695c5024d3.tar.bz2 coreutils-21b5147fd8ee493727e2a3ca17b3bf695c5024d3.zip | |
build: don't use recursive make for tests/ subdirectory
* Makefile.am (SUBDIRS): Remove 'tests'.
(include): The '$(top_srcdir)/tests/local.mk' file.
(check-root): Remove this convenience target, it's no longer needed
now that the "real" check-root target once in 'tests/Makefile' will
land in the top-level makefile.
* configure.ac (AC_CONFIG_FILES): Remove 'tests/Makefile'.
* tests/Makefile.am: Rename ...
* tests/local.mk: ... like this, with a lot of adjustments.
* tests/init.cfg: Move ...
* init.cfg: ... here. This is necessary, for a limitation of the
gnulib-provided 'tests/init.sh', which unconditionally look for
'init.cfg' in the $(srcdir) directory.
* tests/*/*.sh: Adjust: expect init.sh to be in '$srcdir/tests',
not in '$srcdir', and extend $PATH with './src', not with '../src'.
* tests/Coreutils.pm: Adjust similarly.
* tests/pr/pr-tests.pl ($pfx): Likewise.
442 files changed, 1264 insertions, 1274 deletions
diff --git a/Makefile.am b/Makefile.am index 8ae8650d9..4999ca14d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ ALL_RECURSIVE_TARGETS = -SUBDIRS = lib po . tests gnulib-tests +SUBDIRS = lib po . gnulib-tests changelog_etc = \ ChangeLog-2005 \ @@ -72,11 +72,6 @@ $(srcdir)/src/cu-progs.mk: $(gen_progs_lists) ACLOCAL_AMFLAGS = -I m4 -# Some tests always need root privileges, others need them only sometimes. -ALL_RECURSIVE_TARGETS += check-root -check-root: - cd tests && $(MAKE) $@ SUBDIRS= - # Shortcut targets to make it easier to run (very) expensive tests. check-expensive: $(MAKE) check RUN_EXPENSIVE_TESTS=yes @@ -184,3 +179,4 @@ check-git-hook-script-sync: include $(top_srcdir)/src/local.mk include $(top_srcdir)/doc/local.mk include $(top_srcdir)/man/local.mk +include $(top_srcdir)/tests/local.mk diff --git a/configure.ac b/configure.ac index 5e8ce24b1..d087c33b5 100644 --- a/configure.ac +++ b/configure.ac @@ -480,7 +480,6 @@ AC_CONFIG_FILES( Makefile lib/Makefile po/Makefile.in - tests/Makefile gnulib-tests/Makefile ) AC_OUTPUT diff --git a/tests/init.cfg b/init.cfg index f223f13a5..7edfd0f24 100644 --- a/tests/init.cfg +++ b/init.cfg @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - # This goes hand in hand with the "exec 9>&2;" in tests/Makefile.am's # TESTS_ENVIRONMENT definition. stderr_fileno_=9 @@ -399,7 +398,7 @@ fiemap_capable_() warn_ 'fiemap_capable_: python missing: assuming not fiemap capable' return 1 fi - python $abs_srcdir/fiemap-capable "$@" + python $abs_srcdir/tests/fiemap-capable "$@" } # Skip the current test if "." lacks d_type support. @@ -414,7 +413,7 @@ require_dirent_d_type_() df -x xfs . > /dev/null 2>&1 \ || skip_ requires d_type support - python $abs_srcdir/d_type-check \ + python $abs_srcdir/tests/d_type-check \ || skip_ requires d_type support } diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm index a0c1bba7d..340d11005 100644 --- a/tests/Coreutils.pm +++ b/tests/Coreutils.pm @@ -33,7 +33,7 @@ my @Types = qw (IN IN_PIPE OUT ERR AUX CMP EXIT PRE POST OUT_SUBST my %Types = map {$_ => 1} @Types; my %Zero_one_type = map {$_ => 1} qw (OUT ERR EXIT PRE POST OUT_SUBST ERR_SUBST ENV); -my $srcdir = $ENV{srcdir}; +my $srcdir = "$ENV{srcdir}"; my $Global_count = 1; # When running in a DJGPP environment, make $ENV{SHELL} point to bash. @@ -46,7 +46,7 @@ defined $ENV{DJDIR} # ================ # 'contents' contents only (file name is derived from test name) # {filename => 'contents'} filename and contents -# {filename => undef} filename only -- $(srcdir)/filename must exist +# {filename => undef} filename only -- $(srcdir)/tests/filename must exist # # FIXME: If there is more than one input file, then you can't specify 'REDIR'. # PIPE is still ok. @@ -185,7 +185,7 @@ sub _process_file_spec ($$$$$) # FIXME: put $srcdir in here somewhere warn "$program_name: $test_name: specified file '$file' does" . " not exist\n" - if ! -f "$srcdir/$file"; + if ! -f "$srcdir/tests/$file"; } return $file; diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 56ca499b7..000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,805 +0,0 @@ -## Process this file with automake to produce Makefile.in -*-Makefile-*-. - -## Copyright (C) 2007-2012 Free Software Foundation, Inc. - -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. - -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. - -## You should have received a copy of the GNU General Public License -## along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Indirections required so that we'll still be able to know the -# complete list of our tests even if the user override TESTS from the -# command line (which he's allowed to do by the test harness API). -TESTS = $(all_tests) -root_tests = $(all_root_tests) - -# Ensure that each version-controlled file in 'tests/' with a suffix -# specified in $(TEST_EXTENSIONS) is listed in $(all_tests). -vc_exe_in_TESTS: - $(AM_V_GEN)test -d $(top_srcdir)/.git || exit 1; \ - bs="\\"; \ - test_extensions_rx=`echo $(TEST_EXTENSIONS) \ - | sed -e "s/ /|/g" -e "s/$$bs./$$bs$$bs./g"`; \ - { \ - for t in $(all_tests); do echo $$t; done; \ - cd $(top_srcdir); \ - $(SHELL) build-aux/vc-list-files $(subdir) \ - | sed 's!^$(subdir)/!!' | grep -v '^init\.sh$$' \ - | $(EGREP) "$$test_extensions_rx\$$"; \ - } | sort | uniq -u | grep . && exit 1; : - -check-local: vc_exe_in_TESTS -.PHONY: vc_exe_in_TESTS - -TEST_EXTENSIONS = .sh .pl .xpl - -if HAVE_PERL -TESTSUITE_PERL = $(PERL) -else -TESTSUITE_PERL = $(SHELL) $(srcdir)/no-perl -endif - -# Options passed to the perl invocations running the perl test scripts. -TESTSUITE_PERL_OPTIONS = -w -I$(srcdir) -MCoreutils -MCuSkip -# '$f' is set by the Automake-generated test harness to the path of the -# current test script stripped of VPATH components, and is used by the -# CuTmpdir module to determine the name of the temporary files to be -# used. Note that $f is a shell variable, not a make macro, so the use -# of '$$f' below is correct, and not a typo. -TESTSUITE_PERL_OPTIONS += -M"CuTmpdir qw($$f)" - -SH_LOG_COMPILER = $(SHELL) -PL_LOG_COMPILER = $(TESTSUITE_PERL) $(TESTSUITE_PERL_OPTIONS) -# Perl scripts that must be run in tainted mode. -XPL_LOG_COMPILER = $(TESTSUITE_PERL) -T $(TESTSUITE_PERL_OPTIONS) - -# Note that the first lines are statements. They ensure that environment -# variables that can perturb tests are unset or set to expected values. -# The rest are envvar settings that propagate build-related Makefile -# variables to test scripts. -AM_TESTS_ENVIRONMENT = \ - . $(srcdir)/lang-default; \ - tmp__=$${TMPDIR-/tmp}; \ - test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \ - . $(srcdir)/envvar-check; \ - TMPDIR=$$tmp__; export TMPDIR; \ - export \ - VERSION='$(VERSION)' \ - LOCALE_FR='$(LOCALE_FR)' \ - LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \ - abs_top_builddir='$(abs_top_builddir)' \ - abs_top_srcdir='$(abs_top_srcdir)' \ - abs_srcdir='$(abs_srcdir)' \ - built_programs='$(built_programs)' \ - host_os=$(host_os) \ - host_triplet='$(host_triplet)' \ - srcdir='$(srcdir)' \ - top_srcdir='$(top_srcdir)' \ - CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \ - CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \ - CC='$(CC)' \ - AWK='$(AWK)' \ - EGREP='$(EGREP)' \ - EXEEXT='$(EXEEXT)' \ - MAKE=$(MAKE) \ - PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \ - PACKAGE_VERSION=$(PACKAGE_VERSION) \ - PERL='$(PERL)' \ - PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ - ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \ - PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ - ; 9>&2 - -# On failure, display the global testsuite log on stdout. -VERBOSE = yes - -# Sort in traditional ASCII order, regardless of the current locale; -# otherwise we may get into trouble with distinct strings that the -# current locale considers to be equal. -ASSORT = LC_ALL=C sort - -EXTRA_DIST = \ - Coreutils.pm \ - CuSkip.pm \ - CuTmpdir.pm \ - d_type-check \ - envvar-check \ - filefrag-extent-compare \ - fiemap-capable \ - init.cfg \ - init.sh \ - lang-default \ - no-perl \ - other-fs-tmpdir \ - sample-test \ - $(pr_data) - -all_root_tests = \ - chown/basic.sh \ - cp/cp-a-selinux.sh \ - cp/preserve-gid.sh \ - cp/special-bits.sh \ - cp/cp-mv-enotsup-xattr.sh \ - cp/capability.sh \ - cp/sparse-fiemap.sh \ - dd/skip-seek-past-dev.sh \ - df/problematic-chars.sh \ - du/bind-mount-dir-cycle.sh \ - install/install-C-root.sh \ - ls/capability.sh \ - ls/nameless-uid.sh \ - misc/chcon.sh \ - misc/chroot-credentials.sh \ - misc/id-setgid.sh \ - misc/selinux.sh \ - misc/truncate-owned-by-other.sh \ - mkdir/writable-under-readonly.sh \ - mv/sticky-to-xpart.sh \ - rm/fail-2eperm.sh \ - rm/no-give-up.sh \ - rm/one-file-system.sh \ - rm/read-only.sh \ - tail-2/append-only.sh \ - touch/now-owned-by-other.sh - -.PHONY: check-root -check-root: - $(MAKE) check TESTS='$(root_tests)' - -EXTRA_DIST += $(all_tests) - -# Do not choose a name that is a shell keyword like 'if', or a -# commonly-used utility like 'cat' or 'test', as the name of a test. -# Otherwise, VPATH builds will fail on hosts like Solaris, since they -# will expand 'if test ...' to 'if .../test ...', and the '.../test' -# will execute the test script rather than the standard utility. - -# Notes on the ordering of these tests: -# Place early in the list tests of the tools that -# are most commonly used in test scripts themselves. -# E.g., nearly every test script uses rm and chmod. -# help-version comes early because it's a basic sanity test. -# Put seq early, since lots of other tests use it. -# Put tests that sleep early, but not all together, so in parallel builds -# they share time with tests that burn CPU, not with others that sleep. -# Put head-elide-tail early, because it's long-running. - -all_tests = \ - misc/help-version.sh \ - tail-2/inotify-race.sh \ - misc/invalid-opt.pl \ - rm/ext3-perf.sh \ - rm/cycle.sh \ - cp/link-heap.sh \ - misc/tty-eof.pl \ - tail-2/inotify-hash-abuse.sh \ - tail-2/inotify-hash-abuse2.sh \ - tail-2/F-vs-missing.sh \ - tail-2/F-vs-rename.sh \ - tail-2/inotify-rotate.sh \ - chmod/no-x.sh \ - chgrp/basic.sh \ - rm/dangling-symlink.sh \ - misc/ls-time.sh \ - rm/d-1.sh \ - rm/d-2.sh \ - rm/d-3.sh \ - rm/deep-1.sh \ - rm/deep-2.sh \ - rm/dir-no-w.sh \ - rm/dir-nonrecur.sh \ - rm/dot-rel.sh \ - rm/isatty.sh \ - rm/empty-inacc.sh \ - rm/empty-name.pl \ - rm/f-1.sh \ - rm/fail-eacces.sh \ - rm/fail-eperm.xpl \ - tail-2/assert.sh \ - rm/hash.sh \ - rm/i-1.sh \ - rm/i-never.sh \ - rm/i-no-r.sh \ - tail-2/infloop-1.sh \ - rm/ignorable.sh \ - rm/inaccessible.sh \ - rm/interactive-always.sh \ - rm/interactive-once.sh \ - rm/ir-1.sh \ - rm/one-file-system2.sh \ - rm/r-1.sh \ - rm/r-2.sh \ - rm/r-3.sh \ - rm/r-4.sh \ - rm/readdir-bug.sh \ - rm/rm1.sh \ - touch/empty-file.sh \ - rm/rm2.sh \ - rm/rm3.sh \ - rm/rm4.sh \ - rm/rm5.sh \ - rm/sunos-1.sh \ - rm/unread2.sh \ - rm/unread3.sh \ - rm/unreadable.pl \ - rm/v-slash.sh \ - rm/many-dir-entries-vs-OOM.sh \ - chgrp/default-no-deref.sh \ - chgrp/deref.sh \ - chgrp/no-x.sh \ - chgrp/posix-H.sh \ - chgrp/recurse.sh \ - fmt/base.pl \ - fmt/long-line.sh \ - fmt/goal-option.sh \ - misc/env.sh \ - misc/ptx.pl \ - misc/test.pl \ - misc/seq.pl \ - misc/seq-long-double.sh \ - misc/head.pl \ - misc/head-elide-tail.pl \ - tail-2/tail-n0f.sh \ - misc/ls-misc.pl \ - misc/date.pl \ - misc/date-next-dow.pl \ - misc/ptx-overrun.sh \ - misc/xstrtol.pl \ - tail-2/pid.sh \ - misc/od.pl \ - misc/od-float.sh \ - misc/mktemp.pl \ - misc/arch.sh \ - misc/pr.pl \ - misc/join.pl \ - pr/pr-tests.pl \ - misc/pwd-option.sh \ - misc/chcon-fail.sh \ - misc/cut.pl \ - misc/wc.pl \ - misc/wc-files0-from.pl \ - misc/wc-files0.sh \ - misc/wc-parallel.sh \ - misc/cat-proc.sh \ - misc/cat-buf.sh \ - misc/base64.pl \ - misc/basename.pl \ - misc/close-stdout.sh \ - misc/chroot-fail.sh \ - misc/comm.pl \ - misc/csplit.sh \ - misc/csplit-1000.sh \ - misc/csplit-heap.sh \ - misc/date-sec.sh \ - misc/dircolors.pl \ - misc/dirname.pl \ - misc/env-null.sh \ - misc/expand.pl \ - misc/expr.pl \ - misc/factor.pl \ - misc/false-status.sh \ - misc/fold.pl \ - misc/groups-dash.sh \ - misc/groups-version.sh \ - misc/head-c.sh \ - misc/head-pos.sh \ - misc/id-context.sh \ - misc/id-groups.sh \ - misc/id-setgid.sh \ - misc/md5sum.pl \ - misc/md5sum-bsd.sh \ - misc/md5sum-newline.pl \ - misc/md5sum-parallel.sh \ - misc/mknod.sh \ - misc/nice.sh \ - misc/nice-fail.sh \ - misc/nl.sh \ - misc/nohup.sh \ - misc/nproc-avail.sh \ - misc/nproc-positive.sh \ - misc/od-N.sh \ - misc/od-multiple-t.sh \ - misc/od-x8.sh \ - misc/paste.pl \ - misc/pathchk1.sh \ - misc/printenv.sh \ - misc/printf.sh \ - misc/printf-cov.pl \ - misc/printf-hex.sh \ - misc/printf-surprise.sh \ - misc/pwd-long.sh \ - misc/readlink-fp-loop.sh \ - misc/readlink-root.sh \ - misc/realpath.sh \ - misc/runcon-no-reorder.sh \ - misc/sha1sum.pl \ - misc/sha1sum-vec.pl \ - misc/sha224sum.pl \ - misc/sha256sum.pl \ - misc/sha384sum.pl \ - misc/sha512sum.pl \ - misc/shred-exact.sh \ - misc/shred-passes.sh \ - misc/shred-remove.sh \ - misc/shuf.sh \ - misc/sort.pl \ - misc/sort-benchmark-random.sh \ - misc/sort-compress.sh \ - misc/sort-compress-hang.sh \ - misc/sort-compress-proc.sh \ - misc/sort-continue.sh \ - misc/sort-debug-keys.sh \ - misc/sort-debug-warn.sh \ - misc/sort-discrim.sh \ - misc/sort-files0-from.pl \ - misc/sort-float.sh \ - misc/sort-merge.pl \ - misc/sort-merge-fdlimit.sh \ - misc/sort-month.sh \ - misc/sort-exit-early.sh \ - misc/sort-rand.sh \ - misc/sort-spinlock-abuse.sh \ - misc/sort-stale-thread-mem.sh \ - misc/sort-unique.sh \ - misc/sort-unique-segv.sh \ - misc/sort-version.sh \ - misc/sort-NaN-infloop.sh \ - misc/sort-u-FMR.sh \ - split/filter.sh \ - split/suffix-auto-length.sh \ - split/suffix-length.sh \ - split/additional-suffix.sh \ - split/b-chunk.sh \ - split/fail.sh \ - split/lines.sh \ - split/l-chunk.sh \ - split/r-chunk.sh \ - split/numeric.sh \ - split/guard-input.sh \ - misc/stat-birthtime.sh \ - misc/stat-fmt.sh \ - misc/stat-hyphen.sh \ - misc/stat-mount.sh \ - misc/stat-nanoseconds.sh \ - misc/stat-printf.pl \ - misc/stat-slash.sh \ - misc/stdbuf.sh \ - misc/stty.sh \ - misc/stty-invalid.sh \ - misc/stty-pairs.sh \ - misc/stty-row-col.sh \ - misc/sum.pl \ - misc/sum-sysv.sh \ - misc/tac.pl \ - misc/tac-continue.sh \ - misc/tac-2-nonseekable.sh \ - misc/tail.pl \ - misc/tee.sh \ - misc/tee-dash.sh \ - misc/test-diag.pl \ - misc/timeout.sh \ - misc/timeout-group.sh \ - misc/timeout-parameters.sh \ - misc/tr.pl \ - misc/tr-case-class.sh \ - misc/truncate-dangling-symlink.sh \ - misc/truncate-dir-fail.sh \ - misc/truncate-fail-diag.sh \ - misc/truncate-fifo.sh \ - misc/truncate-no-create-missing.sh \ - misc/truncate-overflow.sh \ - misc/truncate-parameters.sh \ - misc/truncate-relative.sh \ - misc/tsort.pl \ - misc/unexpand.pl \ - misc/uniq.pl \ - misc/uniq-perf.sh \ - misc/xattr.sh \ - tail-2/wait.sh \ - chmod/c-option.sh \ - chmod/equal-x.sh \ - chmod/equals.sh \ - chmod/inaccessible.sh \ - chmod/octal.sh \ - chmod/setgid.sh \ - chmod/silent.sh \ - chmod/thru-dangling.sh \ - chmod/umask-x.sh \ - chmod/usage.sh \ - chown/deref.sh \ - chown/preserve-root.sh \ - chown/separator.sh \ - cp/abuse.sh \ - cp/acl.sh \ - cp/attr-existing.sh \ - cp/backup-1.sh \ - cp/backup-dir.sh \ - cp/backup-is-src.sh \ - cp/cp-HL.sh \ - cp/cp-deref.sh \ - cp/cp-i.sh \ - cp/cp-mv-backup.sh \ - cp/cp-parents.sh \ - cp/deref-slink.sh \ - cp/dir-rm-dest.sh \ - cp/dir-slash.sh \ - cp/dir-vs-file.sh \ - cp/existing-perm-dir.sh \ - cp/existing-perm-race.sh \ - cp/fail-perm.sh \ - cp/fiemap-empty.sh \ - cp/fiemap-perf.sh \ - cp/fiemap-2.sh \ - cp/file-perm-race.sh \ - cp/into-self.sh \ - cp/link.sh \ - cp/link-no-deref.sh \ - cp/link-preserve.sh \ - cp/link-symlink.sh \ - cp/nfs-removal-race.sh \ - cp/no-deref-link1.sh \ - cp/no-deref-link2.sh \ - cp/no-deref-link3.sh \ - cp/parent-perm.sh \ - cp/parent-perm-race.sh \ - cp/perm.sh \ - cp/preserve-2.sh \ - cp/preserve-link.sh \ - cp/preserve-slink-time.sh \ - cp/proc-short-read.sh \ - cp/proc-zero-len.sh \ - cp/r-vs-symlink.sh \ - cp/reflink-auto.sh \ - cp/reflink-perm.sh \ - cp/same-file.sh \ - cp/slink-2-slink.sh \ - cp/sparse.sh \ - cp/sparse-to-pipe.sh \ - cp/special-f.sh \ - cp/src-base-dot.sh \ - cp/symlink-slash.sh \ - cp/thru-dangling.sh \ - df/header.sh \ - df/df-P.sh \ - df/unreadable.sh \ - df/total-unprocessed.sh \ - df/no-mtab-status.sh \ - dd/direct.sh \ - dd/misc.sh \ - dd/nocache.sh \ - dd/not-rewound.sh \ - dd/reblock.sh \ - dd/skip-seek.pl \ - dd/skip-seek2.sh \ - dd/bytes.sh \ - dd/skip-seek-past-file.sh \ - dd/sparse.sh \ - dd/stderr.sh \ - dd/unblock.pl \ - dd/unblock-sync.sh \ - df/total-verify.sh \ - du/2g.sh \ - du/8gb.sh \ - du/basic.sh \ - du/bigtime.sh \ - du/deref.sh \ - du/deref-args.sh \ - du/exclude.sh \ - du/fd-leak.sh \ - du/files0-from.pl \ - du/files0-from-dir.sh \ - du/hard-link.sh \ - du/inacc-dest.sh \ - du/inacc-dir.sh \ - du/inaccessible-cwd.sh \ - du/long-from-unreadable.sh \ - du/long-sloop.sh \ - du/max-depth.sh \ - du/move-dir-while-traversing.sh \ - du/no-deref.sh \ - du/no-x.sh \ - du/one-file-system.sh \ - du/restore-wd.sh \ - du/slash.sh \ - du/slink.sh \ - du/trailing-slash.sh \ - du/two-args.sh \ - id/gnu-zero-uids.sh \ - id/no-context.sh \ - install/basic-1.sh \ - install/create-leading.sh \ - install/d-slashdot.sh \ - install/install-C.sh \ - install/install-C-selinux.sh \ - install/strip-program.sh \ - install/trap.sh \ - ln/backup-1.sh \ - ln/hard-backup.sh \ - ln/hard-to-sym.sh \ - ln/misc.sh \ - ln/relative.sh \ - ln/sf-1.sh \ - ln/slash-decorated-nonexistent-dest.sh \ - ln/target-1.sh \ - ls/abmon-align.sh \ - ls/block-size.sh \ - ls/color-clear-to-eol.sh \ - ls/color-dtype-dir.sh \ - ls/color-norm.sh \ - ls/dangle.sh \ - ls/dired.sh \ - ls/file-type.sh \ - ls/follow-slink.sh \ - ls/getxattr-speedup.sh \ - ls/infloop.sh \ - ls/inode.sh \ - ls/m-option.sh \ - ls/multihardlink.sh \ - ls/no-arg.sh \ - ls/no-cap.sh \ - ls/proc-selinux-segfault.sh \ - ls/readdir-mountpoint-inode.sh \ - ls/recursive.sh \ - ls/root-rel-symlink-color.sh \ - ls/rt-1.sh \ - ls/slink-acl.sh \ - ls/stat-dtype.sh \ - ls/stat-failed.sh \ - ls/stat-free-color.sh \ - ls/stat-free-symlinks.sh \ - ls/stat-vs-dirent.sh \ - ls/symlink-slash.sh \ - ls/time-style-diag.sh \ - ls/x-option.sh \ - mkdir/p-1.sh \ - mkdir/p-2.sh \ - mkdir/p-3.sh \ - mkdir/p-slashdot.sh \ - mkdir/p-thru-slink.sh \ - mkdir/p-v.sh \ - mkdir/parents.sh \ - mkdir/perm.sh \ - mkdir/selinux.sh \ - mkdir/special-1.sh \ - mkdir/t-slash.sh \ - mv/acl.sh \ - mv/atomic.sh \ - mv/atomic2.sh \ - mv/backup-dir.sh \ - mv/backup-is-src.sh \ - mv/childproof.sh \ - mv/diag.sh \ - mv/dir-file.sh \ - mv/dir2dir.sh \ - mv/dup-source.sh \ - mv/force.sh \ - mv/hard-2.sh \ - mv/hard-3.sh \ - mv/hard-4.sh \ - mv/hard-link-1.sh \ - mv/hard-verbose.sh \ - mv/i-1.pl \ - mv/i-2.sh \ - mv/i-3.sh \ - mv/i-4.sh \ - mv/i-5.sh \ - mv/i-link-no.sh \ - mv/into-self.sh \ - mv/into-self-2.sh \ - mv/into-self-3.sh \ - mv/into-self-4.sh \ - mv/leak-fd.sh \ - mv/mv-n.sh \ - mv/mv-special-1.sh \ - mv/no-target-dir.sh \ - mv/part-fail.sh \ - mv/part-hardlink.sh \ - mv/part-rename.sh \ - mv/part-symlink.sh \ - mv/partition-perm.sh \ - mv/perm-1.sh \ - mv/symlink-onto-hardlink.sh \ - mv/symlink-onto-hardlink-to-self.sh \ - mv/to-symlink.sh \ - mv/trailing-slash.sh \ - mv/update.sh \ - readlink/can-e.sh \ - readlink/can-f.sh \ - readlink/can-m.sh \ - readlink/rl-1.sh \ - rmdir/fail-perm.sh \ - rmdir/ignore.sh \ - rmdir/t-slash.sh \ - tail-2/assert-2.sh \ - tail-2/big-4gb.sh \ - tail-2/flush-initial.sh \ - tail-2/follow-name.sh \ - tail-2/follow-stdin.sh \ - tail-2/pipe-f.sh \ - tail-2/pipe-f2.sh \ - tail-2/proc-ksyms.sh \ - tail-2/start-middle.sh \ - touch/60-seconds.sh \ - touch/dangling-symlink.sh \ - touch/dir-1.sh \ - touch/fail-diag.sh \ - touch/fifo.sh \ - touch/no-create-missing.sh \ - touch/no-dereference.sh \ - touch/no-rights.sh \ - touch/not-owner.sh \ - touch/obsolescent.sh \ - touch/read-only.sh \ - touch/relative.sh \ - touch/trailing-slash.sh \ - $(all_root_tests) - -pr_data = \ - pr/0F \ - pr/0FF \ - pr/0FFnt \ - pr/0FFt \ - pr/0FnFnt \ - pr/0FnFt \ - pr/0Fnt \ - pr/0Ft \ - pr/2-S_f-t_notab \ - pr/2-Sf-t_notab \ - pr/2f-t_notab \ - pr/2s_f-t_notab \ - pr/2s_w60f-t_nota \ - pr/2sf-t_notab \ - pr/2sw60f-t_notab \ - pr/2w60f-t_notab \ - pr/3-0F \ - pr/3-5l24f-t \ - pr/3-FF \ - pr/3a2l17-FF \ - pr/3a3f-0F \ - pr/3a3l15-t \ - pr/3a3l15f-t \ - pr/3b2l17-FF \ - pr/3b3f-0F \ - pr/3b3f-0FF \ - pr/3b3f-FF \ - pr/3b3l15-t \ - pr/3b3l15f-t \ - pr/3f-0F \ - pr/3f-FF \ - pr/3l24-t \ - pr/3l24f-t \ - pr/3ml24-FF \ - pr/3ml24-t \ - pr/3ml24-t-FF \ - pr/3ml24f-t \ - pr/4-7l24-FF \ - pr/4l24-FF \ - pr/FF \ - pr/FFn \ - pr/FFtn \ - pr/FnFn \ - pr/Ja3l24f-lm \ - pr/Jb3l24f-lm \ - pr/Jml24f-lm-lo \ - pr/W-72l24f-ll \ - pr/W20l24f-ll \ - pr/W26l24f-ll \ - pr/W27l24f-ll \ - pr/W28l24f-ll \ - pr/W35Ja3l24f-lm \ - pr/W35Jb3l24f-lm \ - pr/W35Jml24f-lmlo \ - pr/W35a3l24f-lm \ - pr/W35b3l24f-lm \ - pr/W35ml24f-lm-lo \ - pr/W72Jl24f-ll \ - pr/a2l15-FF \ - pr/a2l17-FF \ - pr/a3-0F \ - pr/a3f-0F \ - pr/a3f-0FF \ - pr/a3f-FF \ - pr/a3l15-t \ - pr/a3l15f-t \ - pr/a3l24f-lm \ - pr/b2l15-FF \ - pr/b2l17-FF \ - pr/b3-0F \ - pr/b3f-0F \ - pr/b3f-0FF \ - pr/b3f-FF \ - pr/b3l15-t \ - pr/b3l15f-t \ - pr/b3l24f-lm \ - pr/l24-FF \ - pr/l24-t \ - pr/l24f-t \ - pr/loli \ - pr/ml20-FF-t \ - pr/ml24-FF \ - pr/ml24-t \ - pr/ml24-t-FF \ - pr/ml24f-0F \ - pr/ml24f-lm-lo \ - pr/ml24f-t \ - pr/ml24f-t-0F \ - pr/n+2-5l24f-0FF \ - pr/n+2l24f-0FF \ - pr/n+2l24f-bl \ - pr/n+3-7l24-FF \ - pr/n+3l24f-0FF \ - pr/n+3l24f-bl \ - pr/n+3ml20f-bl-FF \ - pr/n+3ml24f-bl-tn \ - pr/n+3ml24f-tn-bl \ - pr/n+4-8a2l17-FF \ - pr/n+4b2l17f-0FF \ - pr/n+5-8b3l17f-FF \ - pr/n+5a3l13f-0FF \ - pr/n+6a2l17-FF \ - pr/n+6b3l13f-FF \ - pr/n+7l24-FF \ - pr/n+8l20-FF \ - pr/nJml24f-lmlmlo \ - pr/nJml24f-lmlolm \ - pr/nN1+3l24f-bl \ - pr/nN15l24f-bl \ - pr/nSml20-bl-FF \ - pr/nSml20-t-t-FF \ - pr/nSml20-t-tFFFF \ - pr/nSml24-bl-FF \ - pr/nSml24-t-t-FF \ - pr/nSml24-t-tFFFF \ - pr/nl24f-bl \ - pr/o3Jml24f-lm-lo \ - pr/o3a3Sl24f-tn \ - pr/o3a3Snl24f-tn \ - pr/o3a3l24f-tn \ - pr/o3b3Sl24f-tn \ - pr/o3b3Snl24f-tn \ - pr/o3b3l24f-tn \ - pr/o3mSl24f-bl-tn \ - pr/o3mSnl24fbltn \ - pr/o3ml24f-bl-tn \ - pr/t-0FF \ - pr/t-FF \ - pr/t-bl \ - pr/t-t \ - pr/tFFn \ - pr/tFFt \ - pr/tFFt-bl \ - pr/tFFt-ll \ - pr/tFFt-lm \ - pr/tFnFt \ - pr/t_notab \ - pr/t_tab \ - pr/t_tab_ \ - pr/ta3-0FF \ - pr/ta3-FF \ - pr/tb3-0FF \ - pr/tb3-FF \ - pr/tn \ - pr/tn2e5o3-t_tab \ - pr/tn2e8-t_tab \ - pr/tn2e8o3-t_tab \ - pr/tn_2e8-t_tab \ - pr/tn_2e8S-t_tab \ - pr/tne8-t_tab \ - pr/tne8o3-t_tab \ - pr/tt-0FF \ - pr/tt-FF \ - pr/tt-bl \ - pr/tt-t \ - pr/tta3-0FF \ - pr/tta3-FF \ - pr/ttb3-0FF \ - pr/ttb3-FF \ - pr/w72l24f-ll diff --git a/tests/chgrp/basic.sh b/tests/chgrp/basic.sh index 8ce2f2ddc..f2d6e1d65 100755 --- a/tests/chgrp/basic.sh +++ b/tests/chgrp/basic.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chgrp require_membership_in_two_groups_ diff --git a/tests/chgrp/default-no-deref.sh b/tests/chgrp/default-no-deref.sh index 5d140a8da..4469d618f 100755 --- a/tests/chgrp/default-no-deref.sh +++ b/tests/chgrp/default-no-deref.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chgrp require_membership_in_two_groups_ diff --git a/tests/chgrp/deref.sh b/tests/chgrp/deref.sh index 4c186ee82..995311290 100755 --- a/tests/chgrp/deref.sh +++ b/tests/chgrp/deref.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chgrp require_membership_in_two_groups_ diff --git a/tests/chgrp/no-x.sh b/tests/chgrp/no-x.sh index 6e9347f99..2b2edc3a6 100755 --- a/tests/chgrp/no-x.sh +++ b/tests/chgrp/no-x.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chgrp require_membership_in_two_groups_ skip_if_root_ diff --git a/tests/chgrp/posix-H.sh b/tests/chgrp/posix-H.sh index 3965f1ff5..9f7d78013 100755 --- a/tests/chgrp/posix-H.sh +++ b/tests/chgrp/posix-H.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chgrp require_membership_in_two_groups_ diff --git a/tests/chgrp/recurse.sh b/tests/chgrp/recurse.sh index 95a910f6c..7861169ae 100755 --- a/tests/chgrp/recurse.sh +++ b/tests/chgrp/recurse.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chgrp require_membership_in_two_groups_ diff --git a/tests/chmod/c-option.sh b/tests/chmod/c-option.sh index 0fc83912a..a7f01daf1 100755 --- a/tests/chmod/c-option.sh +++ b/tests/chmod/c-option.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod umask 0 diff --git a/tests/chmod/equal-x.sh b/tests/chmod/equal-x.sh index e2cac3478..a15e58106 100755 --- a/tests/chmod/equal-x.sh +++ b/tests/chmod/equal-x.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod file=f diff --git a/tests/chmod/equals.sh b/tests/chmod/equals.sh index fd92055c2..6974ee5bb 100755 --- a/tests/chmod/equals.sh +++ b/tests/chmod/equals.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod touch f || framework_failure_ diff --git a/tests/chmod/inaccessible.sh b/tests/chmod/inaccessible.sh index c90406803..37a28a879 100755 --- a/tests/chmod/inaccessible.sh +++ b/tests/chmod/inaccessible.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod mkdir -p d/e || framework_failure_ diff --git a/tests/chmod/no-x.sh b/tests/chmod/no-x.sh index e802b356f..24a0b2faf 100755 --- a/tests/chmod/no-x.sh +++ b/tests/chmod/no-x.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod skip_if_root_ diff --git a/tests/chmod/octal.sh b/tests/chmod/octal.sh index 845116b26..a8ae5557e 100755 --- a/tests/chmod/octal.sh +++ b/tests/chmod/octal.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod diff --git a/tests/chmod/setgid.sh b/tests/chmod/setgid.sh index 7fc6db214..6579e9cc8 100755 --- a/tests/chmod/setgid.sh +++ b/tests/chmod/setgid.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod umask 0 diff --git a/tests/chmod/silent.sh b/tests/chmod/silent.sh index 00e2348fc..f8787653e 100755 --- a/tests/chmod/silent.sh +++ b/tests/chmod/silent.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chgrp chmod chown chmod -f 0 no-such 2> out && fail=1 diff --git a/tests/chmod/thru-dangling.sh b/tests/chmod/thru-dangling.sh index 78124009f..0dac1c24c 100755 --- a/tests/chmod/thru-dangling.sh +++ b/tests/chmod/thru-dangling.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod ln -s non-existent dangle || framework_failure_ diff --git a/tests/chmod/umask-x.sh b/tests/chmod/umask-x.sh index dc133e183..80ca01841 100755 --- a/tests/chmod/umask-x.sh +++ b/tests/chmod/umask-x.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod touch file diff --git a/tests/chmod/usage.sh b/tests/chmod/usage.sh index 9dd65f7cc..e556a9d0b 100755 --- a/tests/chmod/usage.sh +++ b/tests/chmod/usage.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chmod diff --git a/tests/chown/basic.sh b/tests/chown/basic.sh index 6225400e1..520941537 100755 --- a/tests/chown/basic.sh +++ b/tests/chown/basic.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chown require_root_ diff --git a/tests/chown/deref.sh b/tests/chown/deref.sh index d42a05412..76de4b58a 100755 --- a/tests/chown/deref.sh +++ b/tests/chown/deref.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chown ln -s no-such dangle || framework_failure_ diff --git a/tests/chown/preserve-root.sh b/tests/chown/preserve-root.sh index ffad22228..edeb56681 100755 --- a/tests/chown/preserve-root.sh +++ b/tests/chown/preserve-root.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chown skip_if_root_ diff --git a/tests/chown/separator.sh b/tests/chown/separator.sh index d4264a8c8..132d8e975 100755 --- a/tests/chown/separator.sh +++ b/tests/chown/separator.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chown id_u=$(id -u) || framework_failure_ diff --git a/tests/cp/abuse.sh b/tests/cp/abuse.sh index 6338e1f57..5f00550cf 100755 --- a/tests/cp/abuse.sh +++ b/tests/cp/abuse.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir a b c || framework_failure_ diff --git a/tests/cp/acl.sh b/tests/cp/acl.sh index 4520fc9c6..801d124bc 100755 --- a/tests/cp/acl.sh +++ b/tests/cp/acl.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp getfacl setfacl require_acl_ diff --git a/tests/cp/attr-existing.sh b/tests/cp/attr-existing.sh index 9cf0ffcb3..451784139 100755 --- a/tests/cp/attr-existing.sh +++ b/tests/cp/attr-existing.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp printf '1' > file1 diff --git a/tests/cp/backup-1.sh b/tests/cp/backup-1.sh index c7ece5f4d..c79bc26d1 100755 --- a/tests/cp/backup-1.sh +++ b/tests/cp/backup-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp suffix=.b diff --git a/tests/cp/backup-dir.sh b/tests/cp/backup-dir.sh index bc05bd9b0..5f2658cdc 100755 --- a/tests/cp/backup-dir.sh +++ b/tests/cp/backup-dir.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir x y || framework_failure_ diff --git a/tests/cp/backup-is-src.sh b/tests/cp/backup-is-src.sh index 98e2ed09a..d349527aa 100755 --- a/tests/cp/backup-is-src.sh +++ b/tests/cp/backup-is-src.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp echo a > a || framework_failure_ diff --git a/tests/cp/capability.sh b/tests/cp/capability.sh index 94e5aea16..b9e761264 100755 --- a/tests/cp/capability.sh +++ b/tests/cp/capability.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_root_ working_umask_or_skip_ diff --git a/tests/cp/cp-HL.sh b/tests/cp/cp-HL.sh index bbbd75a74..d1ccfd0ba 100755 --- a/tests/cp/cp-HL.sh +++ b/tests/cp/cp-HL.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir src-dir dest-dir || framework_failure_ diff --git a/tests/cp/cp-a-selinux.sh b/tests/cp/cp-a-selinux.sh index b85298488..f398ffb98 100755 --- a/tests/cp/cp-a-selinux.sh +++ b/tests/cp/cp-a-selinux.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_root_ require_selinux_ diff --git a/tests/cp/cp-deref.sh b/tests/cp/cp-deref.sh index 08a1485f9..4d62e868c 100755 --- a/tests/cp/cp-deref.sh +++ b/tests/cp/cp-deref.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir a b c d || framework_failure_ diff --git a/tests/cp/cp-i.sh b/tests/cp/cp-i.sh index 746dc2765..16c80ee29 100755 --- a/tests/cp/cp-i.sh +++ b/tests/cp/cp-i.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir -p a b/a/c || framework_failure_ diff --git a/tests/cp/cp-mv-backup.sh b/tests/cp/cp-mv-backup.sh index 030f722dc..85812b509 100755 --- a/tests/cp/cp-mv-backup.sh +++ b/tests/cp/cp-mv-backup.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp umask 022 diff --git a/tests/cp/cp-mv-enotsup-xattr.sh b/tests/cp/cp-mv-enotsup-xattr.sh index 66e54cf11..2318cc296 100755 --- a/tests/cp/cp-mv-enotsup-xattr.sh +++ b/tests/cp/cp-mv-enotsup-xattr.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv require_root_ diff --git a/tests/cp/cp-parents.sh b/tests/cp/cp-parents.sh index 506e708ac..97a8c9e99 100755 --- a/tests/cp/cp-parents.sh +++ b/tests/cp/cp-parents.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp working_umask_or_skip_ diff --git a/tests/cp/deref-slink.sh b/tests/cp/deref-slink.sh index 93f5cb8ae..9a96c4833 100755 --- a/tests/cp/deref-slink.sh +++ b/tests/cp/deref-slink.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp touch f slink-target || framework_failure_ diff --git a/tests/cp/dir-rm-dest.sh b/tests/cp/dir-rm-dest.sh index b2f0e72c5..046e8d210 100755 --- a/tests/cp/dir-rm-dest.sh +++ b/tests/cp/dir-rm-dest.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir d e || framework_failure_ diff --git a/tests/cp/dir-slash.sh b/tests/cp/dir-slash.sh index b14aad823..846d8e5da 100755 --- a/tests/cp/dir-slash.sh +++ b/tests/cp/dir-slash.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir dir1 dir2 || framework_failure_ diff --git a/tests/cp/dir-vs-file.sh b/tests/cp/dir-vs-file.sh index c8e388fa7..f2fa79176 100755 --- a/tests/cp/dir-vs-file.sh +++ b/tests/cp/dir-vs-file.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir dir || framework_failure_ diff --git a/tests/cp/existing-perm-dir.sh b/tests/cp/existing-perm-dir.sh index 40b55a3f4..bd14ee982 100755 --- a/tests/cp/existing-perm-dir.sh +++ b/tests/cp/existing-perm-dir.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp umask 002 diff --git a/tests/cp/existing-perm-race.sh b/tests/cp/existing-perm-race.sh index 35c1556f5..b683d3597 100755 --- a/tests/cp/existing-perm-race.sh +++ b/tests/cp/existing-perm-race.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_membership_in_two_groups_ diff --git a/tests/cp/fail-perm.sh b/tests/cp/fail-perm.sh index 2c37d6fb1..4098d1f1e 100755 --- a/tests/cp/fail-perm.sh +++ b/tests/cp/fail-perm.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp skip_if_root_ diff --git a/tests/cp/fiemap-2.sh b/tests/cp/fiemap-2.sh index f24baf282..3fd47cc1e 100755 --- a/tests/cp/fiemap-2.sh +++ b/tests/cp/fiemap-2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # Require a fiemap-enabled FS. diff --git a/tests/cp/fiemap-empty.sh b/tests/cp/fiemap-empty.sh index 4ba4ee30e..fb7bb355c 100755 --- a/tests/cp/fiemap-empty.sh +++ b/tests/cp/fiemap-empty.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # FIXME: enable any part of this test that is still relevant, diff --git a/tests/cp/fiemap-perf.sh b/tests/cp/fiemap-perf.sh index ca093b5a0..bb6f5bc53 100755 --- a/tests/cp/fiemap-perf.sh +++ b/tests/cp/fiemap-perf.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # Require a fiemap-enabled FS. diff --git a/tests/cp/file-perm-race.sh b/tests/cp/file-perm-race.sh index fbc9a86eb..c917117c2 100755 --- a/tests/cp/file-perm-race.sh +++ b/tests/cp/file-perm-race.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least diff --git a/tests/cp/into-self.sh b/tests/cp/into-self.sh index 6121f0ad8..2f123e3aa 100755 --- a/tests/cp/into-self.sh +++ b/tests/cp/into-self.sh @@ -21,7 +21,7 @@ # Now it gives this: # cp: can't copy a directory 'dir' into itself 'dir/dir' -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir a dir || framework_failure_ diff --git a/tests/cp/link-heap.sh b/tests/cp/link-heap.sh index 7e948de7b..d243c8154 100755 --- a/tests/cp/link-heap.sh +++ b/tests/cp/link-heap.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp expensive_ require_ulimit_ diff --git a/tests/cp/link-no-deref.sh b/tests/cp/link-no-deref.sh index af48fd085..ac6bc44fe 100755 --- a/tests/cp/link-no-deref.sh +++ b/tests/cp/link-no-deref.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp ln -s no-such-file dangling-slink || framework_failure_ diff --git a/tests/cp/link-preserve.sh b/tests/cp/link-preserve.sh index 9ca1705f5..0c75d305e 100755 --- a/tests/cp/link-preserve.sh +++ b/tests/cp/link-preserve.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp touch a || framework_failure_ diff --git a/tests/cp/link-symlink.sh b/tests/cp/link-symlink.sh index 57bc9c715..518688762 100755 --- a/tests/cp/link-symlink.sh +++ b/tests/cp/link-symlink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # Check that the timestamps of the symlink are copied diff --git a/tests/cp/link.sh b/tests/cp/link.sh index 3a899f31c..3e15bf034 100755 --- a/tests/cp/link.sh +++ b/tests/cp/link.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp touch src || framework_failure_ diff --git a/tests/cp/nfs-removal-race.sh b/tests/cp/nfs-removal-race.sh index cb8aba37f..63382c80f 100755 --- a/tests/cp/nfs-removal-race.sh +++ b/tests/cp/nfs-removal-race.sh @@ -28,7 +28,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # Replace each stat call with a call to this wrapper. diff --git a/tests/cp/no-deref-link1.sh b/tests/cp/no-deref-link1.sh index c2a565793..9ae7eb15f 100755 --- a/tests/cp/no-deref-link1.sh +++ b/tests/cp/no-deref-link1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir a b diff --git a/tests/cp/no-deref-link2.sh b/tests/cp/no-deref-link2.sh index 584029954..52a42ec30 100755 --- a/tests/cp/no-deref-link2.sh +++ b/tests/cp/no-deref-link2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir b diff --git a/tests/cp/no-deref-link3.sh b/tests/cp/no-deref-link3.sh index 5f63f2699..c16668d44 100755 --- a/tests/cp/no-deref-link3.sh +++ b/tests/cp/no-deref-link3.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp msg=bar diff --git a/tests/cp/parent-perm-race.sh b/tests/cp/parent-perm-race.sh index 41486fcb1..209dceaac 100755 --- a/tests/cp/parent-perm-race.sh +++ b/tests/cp/parent-perm-race.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least diff --git a/tests/cp/parent-perm.sh b/tests/cp/parent-perm.sh index bac38c683..7e3eba0d1 100755 --- a/tests/cp/parent-perm.sh +++ b/tests/cp/parent-perm.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp working_umask_or_skip_ diff --git a/tests/cp/perm.sh b/tests/cp/perm.sh index a93df7182..74d948b31 100755 --- a/tests/cp/perm.sh +++ b/tests/cp/perm.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv very_expensive_ diff --git a/tests/cp/preserve-2.sh b/tests/cp/preserve-2.sh index fea4b6c33..9ee21492b 100755 --- a/tests/cp/preserve-2.sh +++ b/tests/cp/preserve-2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least diff --git a/tests/cp/preserve-gid.sh b/tests/cp/preserve-gid.sh index 746c57a60..fbafe1c18 100755 --- a/tests/cp/preserve-gid.sh +++ b/tests/cp/preserve-gid.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_root_ diff --git a/tests/cp/preserve-link.sh b/tests/cp/preserve-link.sh index 5f069af7c..428edc3c5 100755 --- a/tests/cp/preserve-link.sh +++ b/tests/cp/preserve-link.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp same_inode() diff --git a/tests/cp/preserve-slink-time.sh b/tests/cp/preserve-slink-time.sh index dc5d1cdd8..38110c351 100755 --- a/tests/cp/preserve-slink-time.sh +++ b/tests/cp/preserve-slink-time.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null || diff --git a/tests/cp/proc-short-read.sh b/tests/cp/proc-short-read.sh index 632418e4b..df8c12713 100755 --- a/tests/cp/proc-short-read.sh +++ b/tests/cp/proc-short-read.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp kall=/proc/kallsyms diff --git a/tests/cp/proc-zero-len.sh b/tests/cp/proc-zero-len.sh index b8b9e9c60..d51cc1d27 100755 --- a/tests/cp/proc-zero-len.sh +++ b/tests/cp/proc-zero-len.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp touch empty || framework_failure_ diff --git a/tests/cp/r-vs-symlink.sh b/tests/cp/r-vs-symlink.sh index e96c58425..3c579fc7e 100755 --- a/tests/cp/r-vs-symlink.sh +++ b/tests/cp/r-vs-symlink.sh @@ -20,7 +20,7 @@ # though now such usage evokes a warning: # cp: 'slink': WARNING: using -r to copy symbolic links is not portable -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp echo abc > foo || framework_failure_ diff --git a/tests/cp/reflink-auto.sh b/tests/cp/reflink-auto.sh index 036148c4e..7b6eb1956 100755 --- a/tests/cp/reflink-auto.sh +++ b/tests/cp/reflink-auto.sh @@ -16,11 +16,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" a_other="$other_partition_tmpdir/a" rm -f "$a_other" || framework_failure_ diff --git a/tests/cp/reflink-perm.sh b/tests/cp/reflink-perm.sh index c229993a2..22be2612f 100755 --- a/tests/cp/reflink-perm.sh +++ b/tests/cp/reflink-perm.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp diff --git a/tests/cp/same-file.sh b/tests/cp/same-file.sh index 2ca7bf6ba..d653b2d01 100755 --- a/tests/cp/same-file.sh +++ b/tests/cp/same-file.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp # Unset CDPATH. Otherwise, output from the 'cd dir' command diff --git a/tests/cp/slink-2-slink.sh b/tests/cp/slink-2-slink.sh index bf3238736..d7e1e4f76 100755 --- a/tests/cp/slink-2-slink.sh +++ b/tests/cp/slink-2-slink.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp touch file || framework_failure_ diff --git a/tests/cp/sparse-fiemap.sh b/tests/cp/sparse-fiemap.sh index f2e5f330d..65b8e608c 100755 --- a/tests/cp/sparse-fiemap.sh +++ b/tests/cp/sparse-fiemap.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_perl_ @@ -102,7 +102,7 @@ for i in $(seq 1 2 21); do # exclude the physical block numbers; they always differ filefrag -v j1 > ff1 || framework_failure_ filefrag -vs j2 > ff2 || framework_failure_ - { f ff1; f ff2; } | $PERL $abs_top_srcdir/tests/filefrag-extent-compare \ + { f ff1; f ff2; } | $PERL $abs_srcdir/tests/filefrag-extent-compare \ || { warn_ ignoring filefrag-reported extent map differences # Show the differing extent maps. diff --git a/tests/cp/sparse-to-pipe.sh b/tests/cp/sparse-to-pipe.sh index 0cfda8d55..9987a3f56 100755 --- a/tests/cp/sparse-to-pipe.sh +++ b/tests/cp/sparse-to-pipe.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_sparse_support_ diff --git a/tests/cp/sparse.sh b/tests/cp/sparse.sh index a55202877..8965e9a48 100755 --- a/tests/cp/sparse.sh +++ b/tests/cp/sparse.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_sparse_support_ diff --git a/tests/cp/special-bits.sh b/tests/cp/special-bits.sh index 4a00891d9..8058ad352 100755 --- a/tests/cp/special-bits.sh +++ b/tests/cp/special-bits.sh @@ -20,7 +20,7 @@ # This test would fail due to a bug introduced in 4.0y. # The bug was fixed in 4.0z. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp require_root_ diff --git a/tests/cp/special-f.sh b/tests/cp/special-f.sh index a47655ef7..0dea82b0f 100755 --- a/tests/cp/special-f.sh +++ b/tests/cp/special-f.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkfifo_or_skip_ fifo diff --git a/tests/cp/src-base-dot.sh b/tests/cp/src-base-dot.sh index 14438d09a..ecab07828 100755 --- a/tests/cp/src-base-dot.sh +++ b/tests/cp/src-base-dot.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir x y || framework_failure_ diff --git a/tests/cp/symlink-slash.sh b/tests/cp/symlink-slash.sh index 95c9cfa04..fa4e297a2 100755 --- a/tests/cp/symlink-slash.sh +++ b/tests/cp/symlink-slash.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mkdir dir || framework_failure_ diff --git a/tests/cp/thru-dangling.sh b/tests/cp/thru-dangling.sh index f8527af8d..c992c9ca7 100755 --- a/tests/cp/thru-dangling.sh +++ b/tests/cp/thru-dangling.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp ln -s no-such dangle || framework_failure_ diff --git a/tests/dd/bytes.sh b/tests/dd/bytes.sh index 2d40f0641..d11051893 100755 --- a/tests/dd/bytes.sh +++ b/tests/dd/bytes.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd # count_bytes diff --git a/tests/dd/direct.sh b/tests/dd/direct.sh index c231bee30..a00f1cd20 100755 --- a/tests/dd/direct.sh +++ b/tests/dd/direct.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd truncate -s 8192 in || framework_failure_ diff --git a/tests/dd/misc.sh b/tests/dd/misc.sh index 52a5b2081..9a9bba1ea 100755 --- a/tests/dd/misc.sh +++ b/tests/dd/misc.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd tmp_in=dd-in diff --git a/tests/dd/nocache.sh b/tests/dd/nocache.sh index 274bb8a03..5849b2852 100755 --- a/tests/dd/nocache.sh +++ b/tests/dd/nocache.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd # This should not call posix_fadvise diff --git a/tests/dd/not-rewound.sh b/tests/dd/not-rewound.sh index 5364f907f..d469e5b93 100755 --- a/tests/dd/not-rewound.sh +++ b/tests/dd/not-rewound.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd diff --git a/tests/dd/reblock.sh b/tests/dd/reblock.sh index 92253fb19..68e4a56d0 100755 --- a/tests/dd/reblock.sh +++ b/tests/dd/reblock.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd # 2 short reads -> 1 full write + 1 partial write diff --git a/tests/dd/skip-seek-past-dev.sh b/tests/dd/skip-seek-past-dev.sh index f4184b1bf..5f6ba9de2 100755 --- a/tests/dd/skip-seek-past-dev.sh +++ b/tests/dd/skip-seek-past-dev.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd # need write access to local device diff --git a/tests/dd/skip-seek-past-file.sh b/tests/dd/skip-seek-past-file.sh index 0a8e1fdc5..c728b3a52 100755 --- a/tests/dd/skip-seek-past-file.sh +++ b/tests/dd/skip-seek-past-file.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd require_sparse_support_ # for 'truncate --size=$OFF_T_MAX' eval $(getlimits) # for OFF_T limits diff --git a/tests/dd/skip-seek2.sh b/tests/dd/skip-seek2.sh index 7f5e0560f..d01e1effa 100755 --- a/tests/dd/skip-seek2.sh +++ b/tests/dd/skip-seek2.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh index 35ddda91e..0c48140eb 100755 --- a/tests/dd/sparse.sh +++ b/tests/dd/sparse.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd require_sparse_support_ diff --git a/tests/dd/stderr.sh b/tests/dd/stderr.sh index 2c062787d..81e9e554e 100755 --- a/tests/dd/stderr.sh +++ b/tests/dd/stderr.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd p=$abs_top_builddir diff --git a/tests/dd/unblock-sync.sh b/tests/dd/unblock-sync.sh index 68239f228..d185609e9 100755 --- a/tests/dd/unblock-sync.sh +++ b/tests/dd/unblock-sync.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd printf 000100020003xx > in || framework_failure_ diff --git a/tests/df/df-P.sh b/tests/df/df-P.sh index dfce41419..523dc5691 100755 --- a/tests/df/df-P.sh +++ b/tests/df/df-P.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ df diff --git a/tests/df/header.sh b/tests/df/header.sh index 4fc626e8f..0bf285846 100755 --- a/tests/df/header.sh +++ b/tests/df/header.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ df case $(df .) in diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh index e434f5f3e..ff0316ee9 100755 --- a/tests/df/no-mtab-status.sh +++ b/tests/df/no-mtab-status.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ df df || skip_ "df fails" diff --git a/tests/df/problematic-chars.sh b/tests/df/problematic-chars.sh index 801c4d9cf..d4f7c5167 100755 --- a/tests/df/problematic-chars.sh +++ b/tests/df/problematic-chars.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ df require_root_ diff --git a/tests/df/total-unprocessed.sh b/tests/df/total-unprocessed.sh index aa4983683..1bc947d6f 100755 --- a/tests/df/total-unprocessed.sh +++ b/tests/df/total-unprocessed.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ df require_mount_list_ diff --git a/tests/df/total-verify.sh b/tests/df/total-verify.sh index 948b002e0..45c838ecf 100755 --- a/tests/df/total-verify.sh +++ b/tests/df/total-verify.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ df require_perl_ diff --git a/tests/df/unreadable.sh b/tests/df/unreadable.sh index b0ef3fc84..c2af0411f 100755 --- a/tests/df/unreadable.sh +++ b/tests/df/unreadable.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ df skip_if_root_ diff --git a/tests/du/2g.sh b/tests/du/2g.sh index 96cf62d7c..010d8cebb 100755 --- a/tests/du/2g.sh +++ b/tests/du/2g.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Creating a 2GB file counts as 'very expensive'. diff --git a/tests/du/8gb.sh b/tests/du/8gb.sh index 556423e3c..c000718f0 100755 --- a/tests/du/8gb.sh +++ b/tests/du/8gb.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du require_sparse_support_ diff --git a/tests/du/basic.sh b/tests/du/basic.sh index d8acf6420..b05508f2f 100755 --- a/tests/du/basic.sh +++ b/tests/du/basic.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p a/b d d/sub || framework_failure_ diff --git a/tests/du/bigtime.sh b/tests/du/bigtime.sh index 964fb710a..70f69bf2a 100755 --- a/tests/du/bigtime.sh +++ b/tests/du/bigtime.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src export LC_ALL=C export TZ=UTC0 diff --git a/tests/du/bind-mount-dir-cycle.sh b/tests/du/bind-mount-dir-cycle.sh index 516ceae58..d8d381afe 100755 --- a/tests/du/bind-mount-dir-cycle.sh +++ b/tests/du/bind-mount-dir-cycle.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du require_root_ diff --git a/tests/du/deref-args.sh b/tests/du/deref-args.sh index 098e01a46..b4761e5c8 100755 --- a/tests/du/deref-args.sh +++ b/tests/du/deref-args.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/a || framework_failure_ diff --git a/tests/du/deref.sh b/tests/du/deref.sh index 90b765039..77c61c7f3 100755 --- a/tests/du/deref.sh +++ b/tests/du/deref.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p a/sub || framework_failure_ diff --git a/tests/du/exclude.sh b/tests/du/exclude.sh index cad2d7f89..eba0dd227 100755 --- a/tests/du/exclude.sh +++ b/tests/du/exclude.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p a/b/c a/x/y a/u/v || framework_failure_ diff --git a/tests/du/fd-leak.sh b/tests/du/fd-leak.sh index 84a22760a..cb6865017 100755 --- a/tests/du/fd-leak.sh +++ b/tests/du/fd-leak.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Call this an expensive test. It's not that expensive, but command line diff --git a/tests/du/files0-from-dir.sh b/tests/du/files0-from-dir.sh index 86bfe269b..20eb82f7e 100755 --- a/tests/du/files0-from-dir.sh +++ b/tests/du/files0-from-dir.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du wc mkdir dir diff --git a/tests/du/hard-link.sh b/tests/du/hard-link.sh index 0e0641e75..ede8bc8af 100755 --- a/tests/du/hard-link.sh +++ b/tests/du/hard-link.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/sub diff --git a/tests/du/inacc-dest.sh b/tests/du/inacc-dest.sh index c9c709759..54010b343 100755 --- a/tests/du/inacc-dest.sh +++ b/tests/du/inacc-dest.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du skip_if_root_ diff --git a/tests/du/inacc-dir.sh b/tests/du/inacc-dir.sh index 8395c56e8..f03d054ba 100755 --- a/tests/du/inacc-dir.sh +++ b/tests/du/inacc-dir.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du skip_if_root_ diff --git a/tests/du/inaccessible-cwd.sh b/tests/du/inaccessible-cwd.sh index bfc8cf92e..0372ad084 100755 --- a/tests/du/inaccessible-cwd.sh +++ b/tests/du/inaccessible-cwd.sh @@ -20,7 +20,7 @@ # Before the switch to an fts-based implementation in coreutils 5.0.92, # this test would fail. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Skip this test if your system has neither the openat-style functions diff --git a/tests/du/long-from-unreadable.sh b/tests/du/long-from-unreadable.sh index 7fc129c17..8362e98bc 100755 --- a/tests/du/long-from-unreadable.sh +++ b/tests/du/long-from-unreadable.sh @@ -28,7 +28,7 @@ # on Linux+PROC_FS systems because its fts implementation would revert # unnecessarily to using FTS_NOCHDIR mode in this corner case. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du proc_file=/proc/self/fd diff --git a/tests/du/long-sloop.sh b/tests/du/long-sloop.sh index 48e2e30ac..583009d83 100755 --- a/tests/du/long-sloop.sh +++ b/tests/du/long-sloop.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Create lots of directories, each containing a single symlink diff --git a/tests/du/max-depth.sh b/tests/du/max-depth.sh index 30671c4d8..25e2a1289 100755 --- a/tests/du/max-depth.sh +++ b/tests/du/max-depth.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src mkdir -p a/b/c/d/e || framework_failure_ printf 'a/b/c\na/b\na\n' > exp || framework_failure_ diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh index 4f603a0e1..0998d8c32 100755 --- a/tests/du/move-dir-while-traversing.sh +++ b/tests/du/move-dir-while-traversing.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # We use a python-inotify script, so... diff --git a/tests/du/no-deref.sh b/tests/du/no-deref.sh index 2f2055123..e476d8b29 100755 --- a/tests/du/no-deref.sh +++ b/tests/du/no-deref.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/a/b || framework_failure_ diff --git a/tests/du/no-x.sh b/tests/du/no-x.sh index 28f797685..420ae4be5 100755 --- a/tests/du/no-x.sh +++ b/tests/du/no-x.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du skip_if_root_ diff --git a/tests/du/one-file-system.sh b/tests/du/one-file-system.sh index 110080f02..a0e6f0e06 100755 --- a/tests/du/one-file-system.sh +++ b/tests/du/one-file-system.sh @@ -16,10 +16,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" mkdir -p b/c y/z d "$other_partition_tmpdir/x" || framework_failure_ ln -s "$other_partition_tmpdir/x" d || framework_failure_ diff --git a/tests/du/restore-wd.sh b/tests/du/restore-wd.sh index 19ed5fa00..836ce05b1 100755 --- a/tests/du/restore-wd.sh +++ b/tests/du/restore-wd.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir a b || framework_failure_ diff --git a/tests/du/slash.sh b/tests/du/slash.sh index 95012411a..25820c7bb 100755 --- a/tests/du/slash.sh +++ b/tests/du/slash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du require_readable_root_ diff --git a/tests/du/slink.sh b/tests/du/slink.sh index 674e6a224..eba1e4526 100755 --- a/tests/du/slink.sh +++ b/tests/du/slink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Determine if '.' is on a local (would non-NFS be sufficient?) file system. diff --git a/tests/du/trailing-slash.sh b/tests/du/trailing-slash.sh index 4efda6c73..feb9d0641 100755 --- a/tests/du/trailing-slash.sh +++ b/tests/du/trailing-slash.sh @@ -19,7 +19,7 @@ # Before coreutils-4.5.3, it would remove a single trailing slash. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du mkdir -p dir/1/2 || framework_failure_ diff --git a/tests/du/two-args.sh b/tests/du/two-args.sh index 10c0a0578..6a6bbec18 100755 --- a/tests/du/two-args.sh +++ b/tests/du/two-args.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ du # Run this test from a sub-directory one level deeper than normal, diff --git a/tests/fmt/goal-option.sh b/tests/fmt/goal-option.sh index 2efb8c5ce..21d0be46e 100755 --- a/tests/fmt/goal-option.sh +++ b/tests/fmt/goal-option.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ fmt cat <<\_EOF_ > base || fail=1 diff --git a/tests/fmt/long-line.sh b/tests/fmt/long-line.sh index 04674e201..69994c2f7 100755 --- a/tests/fmt/long-line.sh +++ b/tests/fmt/long-line.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ fmt printf '%2030s\n' ' '|sed 's/../ y/g' > in || framework_failure_ diff --git a/tests/id/gnu-zero-uids.sh b/tests/id/gnu-zero-uids.sh index 6ca8dc651..ef47c6cf7 100755 --- a/tests/id/gnu-zero-uids.sh +++ b/tests/id/gnu-zero-uids.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ id require_gnu_ diff --git a/tests/id/no-context.sh b/tests/id/no-context.sh index 94111b84e..063295521 100755 --- a/tests/id/no-context.sh +++ b/tests/id/no-context.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ id # We don't need selinux *FS* support to test id, diff --git a/tests/install/basic-1.sh b/tests/install/basic-1.sh index aa80fcf33..08055f5b9 100755 --- a/tests/install/basic-1.sh +++ b/tests/install/basic-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall skip_if_root_ diff --git a/tests/install/create-leading.sh b/tests/install/create-leading.sh index 0ecf4d958..6a7191905 100755 --- a/tests/install/create-leading.sh +++ b/tests/install/create-leading.sh @@ -19,7 +19,7 @@ # Note that the tests below use 'ginstall', not install, because # that's the name of the binary in ../../src. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall diff --git a/tests/install/d-slashdot.sh b/tests/install/d-slashdot.sh index 2abdd57a8..5e6cb55f3 100755 --- a/tests/install/d-slashdot.sh +++ b/tests/install/d-slashdot.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ install diff --git a/tests/install/install-C-root.sh b/tests/install/install-C-root.sh index 5fbae058a..9a203e989 100755 --- a/tests/install/install-C-root.sh +++ b/tests/install/install-C-root.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall require_root_ skip_if_setgid_ diff --git a/tests/install/install-C-selinux.sh b/tests/install/install-C-selinux.sh index db2a5d227..c8a21e944 100755 --- a/tests/install/install-C-selinux.sh +++ b/tests/install/install-C-selinux.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall require_selinux_ diff --git a/tests/install/install-C.sh b/tests/install/install-C.sh index 0883d9e6b..c3739713c 100755 --- a/tests/install/install-C.sh +++ b/tests/install/install-C.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall skip_if_setgid_ diff --git a/tests/install/strip-program.sh b/tests/install/strip-program.sh index 591614118..d38b4f4c7 100755 --- a/tests/install/strip-program.sh +++ b/tests/install/strip-program.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall working_umask_or_skip_ diff --git a/tests/install/trap.sh b/tests/install/trap.sh index e3ccf54ac..ea7153b84 100755 --- a/tests/install/trap.sh +++ b/tests/install/trap.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ginstall diff --git a/tests/ln/backup-1.sh b/tests/ln/backup-1.sh index ffd630bcf..ecd77f5b1 100755 --- a/tests/ln/backup-1.sh +++ b/tests/ln/backup-1.sh @@ -19,7 +19,7 @@ # Based on a problem report from Jamie Lokier. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln touch a b || framework_failure_ diff --git a/tests/ln/hard-backup.sh b/tests/ln/hard-backup.sh index bc38bbe5d..fe87f6a3e 100755 --- a/tests/ln/hard-backup.sh +++ b/tests/ln/hard-backup.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln touch f || framework_failure_ diff --git a/tests/ln/hard-to-sym.sh b/tests/ln/hard-to-sym.sh index 358b93008..3b30a7109 100755 --- a/tests/ln/hard-to-sym.sh +++ b/tests/ln/hard-to-sym.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln diff --git a/tests/ln/misc.sh b/tests/ln/misc.sh index 4da0eda45..79e2beae6 100755 --- a/tests/ln/misc.sh +++ b/tests/ln/misc.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln t=tln-symlink diff --git a/tests/ln/relative.sh b/tests/ln/relative.sh index cfc34691e..9028b439b 100755 --- a/tests/ln/relative.sh +++ b/tests/ln/relative.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln mkdir -p usr/bin || framework_failure_ diff --git a/tests/ln/sf-1.sh b/tests/ln/sf-1.sh index 824c22432..6efea75b0 100755 --- a/tests/ln/sf-1.sh +++ b/tests/ln/sf-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln echo foo > a || framework_failure_ diff --git a/tests/ln/slash-decorated-nonexistent-dest.sh b/tests/ln/slash-decorated-nonexistent-dest.sh index 5da855e6c..ae24cdc70 100755 --- a/tests/ln/slash-decorated-nonexistent-dest.sh +++ b/tests/ln/slash-decorated-nonexistent-dest.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln touch f || framework_failure_ diff --git a/tests/ln/target-1.sh b/tests/ln/target-1.sh index 1d511e5e7..7dc1829f4 100755 --- a/tests/ln/target-1.sh +++ b/tests/ln/target-1.sh @@ -21,7 +21,7 @@ # ln: 'd/.': cannot overwrite directory # Based on a test case from Dmitry V. Levin. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ln mkdir d || framework_failure_ diff --git a/tests/local.mk b/tests/local.mk new file mode 100644 index 000000000..56baa2781 --- /dev/null +++ b/tests/local.mk @@ -0,0 +1,801 @@ +## Process this file with automake to produce Makefile.in -*-Makefile-*-. + +## Copyright (C) 2007-2012 Free Software Foundation, Inc. + +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Indirections required so that we'll still be able to know the +# complete list of our tests even if the user override TESTS from the +# command line (which he's allowed to do by the test harness API). +TESTS = $(all_tests) +root_tests = $(all_root_tests) + +EXTRA_DIST += $(all_tests) + +# Ensure that each version-controlled file in 'tests/' with a suffix +# specified in $(TEST_EXTENSIONS) is listed in $(all_tests). +vc_exe_in_TESTS: + $(AM_V_GEN)test -d $(top_srcdir)/.git || exit 1; \ + bs="\\"; \ + test_extensions_rx=`echo $(TEST_EXTENSIONS) \ + | sed -e "s/ /|/g" -e "s/$$bs./$$bs$$bs./g"`; \ + { \ + for t in $(all_tests); do echo $$t; done; \ + cd $(top_srcdir); \ + $(SHELL) build-aux/vc-list-files $(subdir) \ + | grep -v '^tests/init\.sh$$' \ + | $(EGREP) "$$test_extensions_rx\$$"; \ + } | sort | uniq -u | grep . && exit 1; : + +check-local: vc_exe_in_TESTS +.PHONY: vc_exe_in_TESTS + +TEST_EXTENSIONS = .sh .pl .xpl + +if HAVE_PERL +TESTSUITE_PERL = $(PERL) +else +TESTSUITE_PERL = $(SHELL) $(srcdir)/no-perl +endif + +# Options passed to the perl invocations running the perl test scripts. +TESTSUITE_PERL_OPTIONS = -w -I$(srcdir)/tests -MCoreutils -MCuSkip +# '$f' is set by the Automake-generated test harness to the path of the +# current test script stripped of VPATH components, and is used by the +# CuTmpdir module to determine the name of the temporary files to be +# used. Note that $f is a shell variable, not a make macro, so the use +# of '$$f' below is correct, and not a typo. +TESTSUITE_PERL_OPTIONS += -M"CuTmpdir qw($$f)" + +SH_LOG_COMPILER = $(SHELL) +PL_LOG_COMPILER = $(TESTSUITE_PERL) $(TESTSUITE_PERL_OPTIONS) +# Perl scripts that must be run in tainted mode. +XPL_LOG_COMPILER = $(TESTSUITE_PERL) -T $(TESTSUITE_PERL_OPTIONS) + +# Note that the first lines are statements. They ensure that environment +# variables that can perturb tests are unset or set to expected values. +# The rest are envvar settings that propagate build-related Makefile +# variables to test scripts. +AM_TESTS_ENVIRONMENT = \ + . $(srcdir)/tests/lang-default; \ + tmp__=$${TMPDIR-/tmp}; \ + test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \ + . $(srcdir)/tests/envvar-check; \ + TMPDIR=$$tmp__; export TMPDIR; \ + export \ + VERSION='$(VERSION)' \ + LOCALE_FR='$(LOCALE_FR)' \ + LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \ + abs_top_builddir='$(abs_top_builddir)' \ + abs_top_srcdir='$(abs_top_srcdir)' \ + abs_srcdir='$(abs_srcdir)' \ + built_programs='$(built_programs)' \ + host_os=$(host_os) \ + host_triplet='$(host_triplet)' \ + srcdir='$(srcdir)' \ + top_srcdir='$(top_srcdir)' \ + CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \ + CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \ + CC='$(CC)' \ + AWK='$(AWK)' \ + EGREP='$(EGREP)' \ + EXEEXT='$(EXEEXT)' \ + MAKE=$(MAKE) \ + PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \ + PACKAGE_VERSION=$(PACKAGE_VERSION) \ + PERL='$(PERL)' \ + PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ + ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \ + PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ + ; 9>&2 + +# On failure, display the global testsuite log on stdout. +VERBOSE = yes + +EXTRA_DIST += \ + tests/Coreutils.pm \ + tests/CuSkip.pm \ + tests/CuTmpdir.pm \ + tests/d_type-check \ + tests/envvar-check \ + tests/filefrag-extent-compare \ + tests/fiemap-capable \ + init.cfg \ + tests/init.sh \ + tests/lang-default \ + tests/no-perl \ + tests/other-fs-tmpdir \ + tests/sample-test \ + $(pr_data) + +all_root_tests = \ + tests/chown/basic.sh \ + tests/cp/cp-a-selinux.sh \ + tests/cp/preserve-gid.sh \ + tests/cp/special-bits.sh \ + tests/cp/cp-mv-enotsup-xattr.sh \ + tests/cp/capability.sh \ + tests/cp/sparse-fiemap.sh \ + tests/dd/skip-seek-past-dev.sh \ + tests/df/problematic-chars.sh \ + tests/du/bind-mount-dir-cycle.sh \ + tests/install/install-C-root.sh \ + tests/ls/capability.sh \ + tests/ls/nameless-uid.sh \ + tests/misc/chcon.sh \ + tests/misc/chroot-credentials.sh \ + tests/misc/id-setgid.sh \ + tests/misc/selinux.sh \ + tests/misc/truncate-owned-by-other.sh \ + tests/mkdir/writable-under-readonly.sh \ + tests/mv/sticky-to-xpart.sh \ + tests/rm/fail-2eperm.sh \ + tests/rm/no-give-up.sh \ + tests/rm/one-file-system.sh \ + tests/rm/read-only.sh \ + tests/tail-2/append-only.sh \ + tests/touch/now-owned-by-other.sh + +ALL_RECURSIVE_TARGETS += check-root +.PHONY: check-root +check-root: + $(MAKE) check TESTS='$(root_tests)' + +# Do not choose a name that is a shell keyword like 'if', or a +# commonly-used utility like 'cat' or 'test', as the name of a test. +# Otherwise, VPATH builds will fail on hosts like Solaris, since they +# will expand 'if test ...' to 'if .../test ...', and the '.../test' +# will execute the test script rather than the standard utility. + +# Notes on the ordering of these tests: +# Place early in the list tests of the tools that +# are most commonly used in test scripts themselves. +# E.g., nearly every test script uses rm and chmod. +# help-version comes early because it's a basic sanity test. +# Put seq early, since lots of other tests use it. +# Put tests that sleep early, but not all together, so in parallel builds +# they share time with tests that burn CPU, not with others that sleep. +# Put head-elide-tail early, because it's long-running. + +all_tests = \ + tests/misc/help-version.sh \ + tests/tail-2/inotify-race.sh \ + tests/misc/invalid-opt.pl \ + tests/rm/ext3-perf.sh \ + tests/rm/cycle.sh \ + tests/cp/link-heap.sh \ + tests/misc/tty-eof.pl \ + tests/tail-2/inotify-hash-abuse.sh \ + tests/tail-2/inotify-hash-abuse2.sh \ + tests/tail-2/F-vs-missing.sh \ + tests/tail-2/F-vs-rename.sh \ + tests/tail-2/inotify-rotate.sh \ + tests/chmod/no-x.sh \ + tests/chgrp/basic.sh \ + tests/rm/dangling-symlink.sh \ + tests/misc/ls-time.sh \ + tests/rm/d-1.sh \ + tests/rm/d-2.sh \ + tests/rm/d-3.sh \ + tests/rm/deep-1.sh \ + tests/rm/deep-2.sh \ + tests/rm/dir-no-w.sh \ + tests/rm/dir-nonrecur.sh \ + tests/rm/dot-rel.sh \ + tests/rm/isatty.sh \ + tests/rm/empty-inacc.sh \ + tests/rm/empty-name.pl \ + tests/rm/f-1.sh \ + tests/rm/fail-eacces.sh \ + tests/rm/fail-eperm.xpl \ + tests/tail-2/assert.sh \ + tests/rm/hash.sh \ + tests/rm/i-1.sh \ + tests/rm/i-never.sh \ + tests/rm/i-no-r.sh \ + tests/tail-2/infloop-1.sh \ + tests/rm/ignorable.sh \ + tests/rm/inaccessible.sh \ + tests/rm/interactive-always.sh \ + tests/rm/interactive-once.sh \ + tests/rm/ir-1.sh \ + tests/rm/one-file-system2.sh \ + tests/rm/r-1.sh \ + tests/rm/r-2.sh \ + tests/rm/r-3.sh \ + tests/rm/r-4.sh \ + tests/rm/readdir-bug.sh \ + tests/rm/rm1.sh \ + tests/touch/empty-file.sh \ + tests/rm/rm2.sh \ + tests/rm/rm3.sh \ + tests/rm/rm4.sh \ + tests/rm/rm5.sh \ + tests/rm/sunos-1.sh \ + tests/rm/unread2.sh \ + tests/rm/unread3.sh \ + tests/rm/unreadable.pl \ + tests/rm/v-slash.sh \ + tests/rm/many-dir-entries-vs-OOM.sh \ + tests/chgrp/default-no-deref.sh \ + tests/chgrp/deref.sh \ + tests/chgrp/no-x.sh \ + tests/chgrp/posix-H.sh \ + tests/chgrp/recurse.sh \ + tests/fmt/base.pl \ + tests/fmt/long-line.sh \ + tests/fmt/goal-option.sh \ + tests/misc/env.sh \ + tests/misc/ptx.pl \ + tests/misc/test.pl \ + tests/misc/seq.pl \ + tests/misc/seq-long-double.sh \ + tests/misc/head.pl \ + tests/misc/head-elide-tail.pl \ + tests/tail-2/tail-n0f.sh \ + tests/misc/ls-misc.pl \ + tests/misc/date.pl \ + tests/misc/date-next-dow.pl \ + tests/misc/ptx-overrun.sh \ + tests/misc/xstrtol.pl \ + tests/tail-2/pid.sh \ + tests/misc/od.pl \ + tests/misc/od-float.sh \ + tests/misc/mktemp.pl \ + tests/misc/arch.sh \ + tests/misc/pr.pl \ + tests/misc/join.pl \ + tests/pr/pr-tests.pl \ + tests/misc/pwd-option.sh \ + tests/misc/chcon-fail.sh \ + tests/misc/cut.pl \ + tests/misc/wc.pl \ + tests/misc/wc-files0-from.pl \ + tests/misc/wc-files0.sh \ + tests/misc/wc-parallel.sh \ + tests/misc/cat-proc.sh \ + tests/misc/cat-buf.sh \ + tests/misc/base64.pl \ + tests/misc/basename.pl \ + tests/misc/close-stdout.sh \ + tests/misc/chroot-fail.sh \ + tests/misc/comm.pl \ + tests/misc/csplit.sh \ + tests/misc/csplit-1000.sh \ + tests/misc/csplit-heap.sh \ + tests/misc/date-sec.sh \ + tests/misc/dircolors.pl \ + tests/misc/dirname.pl \ + tests/misc/env-null.sh \ + tests/misc/expand.pl \ + tests/misc/expr.pl \ + tests/misc/factor.pl \ + tests/misc/false-status.sh \ + tests/misc/fold.pl \ + tests/misc/groups-dash.sh \ + tests/misc/groups-version.sh \ + tests/misc/head-c.sh \ + tests/misc/head-pos.sh \ + tests/misc/id-context.sh \ + tests/misc/id-groups.sh \ + tests/misc/id-setgid.sh \ + tests/misc/md5sum.pl \ + tests/misc/md5sum-bsd.sh \ + tests/misc/md5sum-newline.pl \ + tests/misc/md5sum-parallel.sh \ + tests/misc/mknod.sh \ + tests/misc/nice.sh \ + tests/misc/nice-fail.sh \ + tests/misc/nl.sh \ + tests/misc/nohup.sh \ + tests/misc/nproc-avail.sh \ + tests/misc/nproc-positive.sh \ + tests/misc/od-N.sh \ + tests/misc/od-multiple-t.sh \ + tests/misc/od-x8.sh \ + tests/misc/paste.pl \ + tests/misc/pathchk1.sh \ + tests/misc/printenv.sh \ + tests/misc/printf.sh \ + tests/misc/printf-cov.pl \ + tests/misc/printf-hex.sh \ + tests/misc/printf-surprise.sh \ + tests/misc/pwd-long.sh \ + tests/misc/readlink-fp-loop.sh \ + tests/misc/readlink-root.sh \ + tests/misc/realpath.sh \ + tests/misc/runcon-no-reorder.sh \ + tests/misc/sha1sum.pl \ + tests/misc/sha1sum-vec.pl \ + tests/misc/sha224sum.pl \ + tests/misc/sha256sum.pl \ + tests/misc/sha384sum.pl \ + tests/misc/sha512sum.pl \ + tests/misc/shred-exact.sh \ + tests/misc/shred-passes.sh \ + tests/misc/shred-remove.sh \ + tests/misc/shuf.sh \ + tests/misc/sort.pl \ + tests/misc/sort-benchmark-random.sh \ + tests/misc/sort-compress.sh \ + tests/misc/sort-compress-hang.sh \ + tests/misc/sort-compress-proc.sh \ + tests/misc/sort-continue.sh \ + tests/misc/sort-debug-keys.sh \ + tests/misc/sort-debug-warn.sh \ + tests/misc/sort-discrim.sh \ + tests/misc/sort-files0-from.pl \ + tests/misc/sort-float.sh \ + tests/misc/sort-merge.pl \ + tests/misc/sort-merge-fdlimit.sh \ + tests/misc/sort-month.sh \ + tests/misc/sort-exit-early.sh \ + tests/misc/sort-rand.sh \ + tests/misc/sort-spinlock-abuse.sh \ + tests/misc/sort-stale-thread-mem.sh \ + tests/misc/sort-unique.sh \ + tests/misc/sort-unique-segv.sh \ + tests/misc/sort-version.sh \ + tests/misc/sort-NaN-infloop.sh \ + tests/misc/sort-u-FMR.sh \ + tests/split/filter.sh \ + tests/split/suffix-auto-length.sh \ + tests/split/suffix-length.sh \ + tests/split/additional-suffix.sh \ + tests/split/b-chunk.sh \ + tests/split/fail.sh \ + tests/split/lines.sh \ + tests/split/l-chunk.sh \ + tests/split/r-chunk.sh \ + tests/split/numeric.sh \ + tests/split/guard-input.sh \ + tests/misc/stat-birthtime.sh \ + tests/misc/stat-fmt.sh \ + tests/misc/stat-hyphen.sh \ + tests/misc/stat-mount.sh \ + tests/misc/stat-nanoseconds.sh \ + tests/misc/stat-printf.pl \ + tests/misc/stat-slash.sh \ + tests/misc/stdbuf.sh \ + tests/misc/stty.sh \ + tests/misc/stty-invalid.sh \ + tests/misc/stty-pairs.sh \ + tests/misc/stty-row-col.sh \ + tests/misc/sum.pl \ + tests/misc/sum-sysv.sh \ + tests/misc/tac.pl \ + tests/misc/tac-continue.sh \ + tests/misc/tac-2-nonseekable.sh \ + tests/misc/tail.pl \ + tests/misc/tee.sh \ + tests/misc/tee-dash.sh \ + tests/misc/test-diag.pl \ + tests/misc/timeout.sh \ + tests/misc/timeout-group.sh \ + tests/misc/timeout-parameters.sh \ + tests/misc/tr.pl \ + tests/misc/tr-case-class.sh \ + tests/misc/truncate-dangling-symlink.sh \ + tests/misc/truncate-dir-fail.sh \ + tests/misc/truncate-fail-diag.sh \ + tests/misc/truncate-fifo.sh \ + tests/misc/truncate-no-create-missing.sh \ + tests/misc/truncate-overflow.sh \ + tests/misc/truncate-parameters.sh \ + tests/misc/truncate-relative.sh \ + tests/misc/tsort.pl \ + tests/misc/unexpand.pl \ + tests/misc/uniq.pl \ + tests/misc/uniq-perf.sh \ + tests/misc/xattr.sh \ + tests/tail-2/wait.sh \ + tests/chmod/c-option.sh \ + tests/chmod/equal-x.sh \ + tests/chmod/equals.sh \ + tests/chmod/inaccessible.sh \ + tests/chmod/octal.sh \ + tests/chmod/setgid.sh \ + tests/chmod/silent.sh \ + tests/chmod/thru-dangling.sh \ + tests/chmod/umask-x.sh \ + tests/chmod/usage.sh \ + tests/chown/deref.sh \ + tests/chown/preserve-root.sh \ + tests/chown/separator.sh \ + tests/cp/abuse.sh \ + tests/cp/acl.sh \ + tests/cp/attr-existing.sh \ + tests/cp/backup-1.sh \ + tests/cp/backup-dir.sh \ + tests/cp/backup-is-src.sh \ + tests/cp/cp-HL.sh \ + tests/cp/cp-deref.sh \ + tests/cp/cp-i.sh \ + tests/cp/cp-mv-backup.sh \ + tests/cp/cp-parents.sh \ + tests/cp/deref-slink.sh \ + tests/cp/dir-rm-dest.sh \ + tests/cp/dir-slash.sh \ + tests/cp/dir-vs-file.sh \ + tests/cp/existing-perm-dir.sh \ + tests/cp/existing-perm-race.sh \ + tests/cp/fail-perm.sh \ + tests/cp/fiemap-empty.sh \ + tests/cp/fiemap-perf.sh \ + tests/cp/fiemap-2.sh \ + tests/cp/file-perm-race.sh \ + tests/cp/into-self.sh \ + tests/cp/link.sh \ + tests/cp/link-no-deref.sh \ + tests/cp/link-preserve.sh \ + tests/cp/link-symlink.sh \ + tests/cp/nfs-removal-race.sh \ + tests/cp/no-deref-link1.sh \ + tests/cp/no-deref-link2.sh \ + tests/cp/no-deref-link3.sh \ + tests/cp/parent-perm.sh \ + tests/cp/parent-perm-race.sh \ + tests/cp/perm.sh \ + tests/cp/preserve-2.sh \ + tests/cp/preserve-link.sh \ + tests/cp/preserve-slink-time.sh \ + tests/cp/proc-short-read.sh \ + tests/cp/proc-zero-len.sh \ + tests/cp/r-vs-symlink.sh \ + tests/cp/reflink-auto.sh \ + tests/cp/reflink-perm.sh \ + tests/cp/same-file.sh \ + tests/cp/slink-2-slink.sh \ + tests/cp/sparse.sh \ + tests/cp/sparse-to-pipe.sh \ + tests/cp/special-f.sh \ + tests/cp/src-base-dot.sh \ + tests/cp/symlink-slash.sh \ + tests/cp/thru-dangling.sh \ + tests/df/header.sh \ + tests/df/df-P.sh \ + tests/df/unreadable.sh \ + tests/df/total-unprocessed.sh \ + tests/df/no-mtab-status.sh \ + tests/dd/direct.sh \ + tests/dd/misc.sh \ + tests/dd/nocache.sh \ + tests/dd/not-rewound.sh \ + tests/dd/reblock.sh \ + tests/dd/skip-seek.pl \ + tests/dd/skip-seek2.sh \ + tests/dd/bytes.sh \ + tests/dd/skip-seek-past-file.sh \ + tests/dd/sparse.sh \ + tests/dd/stderr.sh \ + tests/dd/unblock.pl \ + tests/dd/unblock-sync.sh \ + tests/df/total-verify.sh \ + tests/du/2g.sh \ + tests/du/8gb.sh \ + tests/du/basic.sh \ + tests/du/bigtime.sh \ + tests/du/deref.sh \ + tests/du/deref-args.sh \ + tests/du/exclude.sh \ + tests/du/fd-leak.sh \ + tests/du/files0-from.pl \ + tests/du/files0-from-dir.sh \ + tests/du/hard-link.sh \ + tests/du/inacc-dest.sh \ + tests/du/inacc-dir.sh \ + tests/du/inaccessible-cwd.sh \ + tests/du/long-from-unreadable.sh \ + tests/du/long-sloop.sh \ + tests/du/max-depth.sh \ + tests/du/move-dir-while-traversing.sh \ + tests/du/no-deref.sh \ + tests/du/no-x.sh \ + tests/du/one-file-system.sh \ + tests/du/restore-wd.sh \ + tests/du/slash.sh \ + tests/du/slink.sh \ + tests/du/trailing-slash.sh \ + tests/du/two-args.sh \ + tests/id/gnu-zero-uids.sh \ + tests/id/no-context.sh \ + tests/install/basic-1.sh \ + tests/install/create-leading.sh \ + tests/install/d-slashdot.sh \ + tests/install/install-C.sh \ + tests/install/install-C-selinux.sh \ + tests/install/strip-program.sh \ + tests/install/trap.sh \ + tests/ln/backup-1.sh \ + tests/ln/hard-backup.sh \ + tests/ln/hard-to-sym.sh \ + tests/ln/misc.sh \ + tests/ln/relative.sh \ + tests/ln/sf-1.sh \ + tests/ln/slash-decorated-nonexistent-dest.sh \ + tests/ln/target-1.sh \ + tests/ls/abmon-align.sh \ + tests/ls/block-size.sh \ + tests/ls/color-clear-to-eol.sh \ + tests/ls/color-dtype-dir.sh \ + tests/ls/color-norm.sh \ + tests/ls/dangle.sh \ + tests/ls/dired.sh \ + tests/ls/file-type.sh \ + tests/ls/follow-slink.sh \ + tests/ls/getxattr-speedup.sh \ + tests/ls/infloop.sh \ + tests/ls/inode.sh \ + tests/ls/m-option.sh \ + tests/ls/multihardlink.sh \ + tests/ls/no-arg.sh \ + tests/ls/no-cap.sh \ + tests/ls/proc-selinux-segfault.sh \ + tests/ls/readdir-mountpoint-inode.sh \ + tests/ls/recursive.sh \ + tests/ls/root-rel-symlink-color.sh \ + tests/ls/rt-1.sh \ + tests/ls/slink-acl.sh \ + tests/ls/stat-dtype.sh \ + tests/ls/stat-failed.sh \ + tests/ls/stat-free-color.sh \ + tests/ls/stat-free-symlinks.sh \ + tests/ls/stat-vs-dirent.sh \ + tests/ls/symlink-slash.sh \ + tests/ls/time-style-diag.sh \ + tests/ls/x-option.sh \ + tests/mkdir/p-1.sh \ + tests/mkdir/p-2.sh \ + tests/mkdir/p-3.sh \ + tests/mkdir/p-slashdot.sh \ + tests/mkdir/p-thru-slink.sh \ + tests/mkdir/p-v.sh \ + tests/mkdir/parents.sh \ + tests/mkdir/perm.sh \ + tests/mkdir/selinux.sh \ + tests/mkdir/special-1.sh \ + tests/mkdir/t-slash.sh \ + tests/mv/acl.sh \ + tests/mv/atomic.sh \ + tests/mv/atomic2.sh \ + tests/mv/backup-dir.sh \ + tests/mv/backup-is-src.sh \ + tests/mv/childproof.sh \ + tests/mv/diag.sh \ + tests/mv/dir-file.sh \ + tests/mv/dir2dir.sh \ + tests/mv/dup-source.sh \ + tests/mv/force.sh \ + tests/mv/hard-2.sh \ + tests/mv/hard-3.sh \ + tests/mv/hard-4.sh \ + tests/mv/hard-link-1.sh \ + tests/mv/hard-verbose.sh \ + tests/mv/i-1.pl \ + tests/mv/i-2.sh \ + tests/mv/i-3.sh \ + tests/mv/i-4.sh \ + tests/mv/i-5.sh \ + tests/mv/i-link-no.sh \ + tests/mv/into-self.sh \ + tests/mv/into-self-2.sh \ + tests/mv/into-self-3.sh \ + tests/mv/into-self-4.sh \ + tests/mv/leak-fd.sh \ + tests/mv/mv-n.sh \ + tests/mv/mv-special-1.sh \ + tests/mv/no-target-dir.sh \ + tests/mv/part-fail.sh \ + tests/mv/part-hardlink.sh \ + tests/mv/part-rename.sh \ + tests/mv/part-symlink.sh \ + tests/mv/partition-perm.sh \ + tests/mv/perm-1.sh \ + tests/mv/symlink-onto-hardlink.sh \ + tests/mv/symlink-onto-hardlink-to-self.sh \ + tests/mv/to-symlink.sh \ + tests/mv/trailing-slash.sh \ + tests/mv/update.sh \ + tests/readlink/can-e.sh \ + tests/readlink/can-f.sh \ + tests/readlink/can-m.sh \ + tests/readlink/rl-1.sh \ + tests/rmdir/fail-perm.sh \ + tests/rmdir/ignore.sh \ + tests/rmdir/t-slash.sh \ + tests/tail-2/assert-2.sh \ + tests/tail-2/big-4gb.sh \ + tests/tail-2/flush-initial.sh \ + tests/tail-2/follow-name.sh \ + tests/tail-2/follow-stdin.sh \ + tests/tail-2/pipe-f.sh \ + tests/tail-2/pipe-f2.sh \ + tests/tail-2/proc-ksyms.sh \ + tests/tail-2/start-middle.sh \ + tests/touch/60-seconds.sh \ + tests/touch/dangling-symlink.sh \ + tests/touch/dir-1.sh \ + tests/touch/fail-diag.sh \ + tests/touch/fifo.sh \ + tests/touch/no-create-missing.sh \ + tests/touch/no-dereference.sh \ + tests/touch/no-rights.sh \ + tests/touch/not-owner.sh \ + tests/touch/obsolescent.sh \ + tests/touch/read-only.sh \ + tests/touch/relative.sh \ + tests/touch/trailing-slash.sh \ + $(all_root_tests) + +pr_data = \ + tests/pr/0F \ + tests/pr/0FF \ + tests/pr/0FFnt \ + tests/pr/0FFt \ + tests/pr/0FnFnt \ + tests/pr/0FnFt \ + tests/pr/0Fnt \ + tests/pr/0Ft \ + tests/pr/2-S_f-t_notab \ + tests/pr/2-Sf-t_notab \ + tests/pr/2f-t_notab \ + tests/pr/2s_f-t_notab \ + tests/pr/2s_w60f-t_nota \ + tests/pr/2sf-t_notab \ + tests/pr/2sw60f-t_notab \ + tests/pr/2w60f-t_notab \ + tests/pr/3-0F \ + tests/pr/3-5l24f-t \ + tests/pr/3-FF \ + tests/pr/3a2l17-FF \ + tests/pr/3a3f-0F \ + tests/pr/3a3l15-t \ + tests/pr/3a3l15f-t \ + tests/pr/3b2l17-FF \ + tests/pr/3b3f-0F \ + tests/pr/3b3f-0FF \ + tests/pr/3b3f-FF \ + tests/pr/3b3l15-t \ + tests/pr/3b3l15f-t \ + tests/pr/3f-0F \ + tests/pr/3f-FF \ + tests/pr/3l24-t \ + tests/pr/3l24f-t \ + tests/pr/3ml24-FF \ + tests/pr/3ml24-t \ + tests/pr/3ml24-t-FF \ + tests/pr/3ml24f-t \ + tests/pr/4-7l24-FF \ + tests/pr/4l24-FF \ + tests/pr/FF \ + tests/pr/FFn \ + tests/pr/FFtn \ + tests/pr/FnFn \ + tests/pr/Ja3l24f-lm \ + tests/pr/Jb3l24f-lm \ + tests/pr/Jml24f-lm-lo \ + tests/pr/W-72l24f-ll \ + tests/pr/W20l24f-ll \ + tests/pr/W26l24f-ll \ + tests/pr/W27l24f-ll \ + tests/pr/W28l24f-ll \ + tests/pr/W35Ja3l24f-lm \ + tests/pr/W35Jb3l24f-lm \ + tests/pr/W35Jml24f-lmlo \ + tests/pr/W35a3l24f-lm \ + tests/pr/W35b3l24f-lm \ + tests/pr/W35ml24f-lm-lo \ + tests/pr/W72Jl24f-ll \ + tests/pr/a2l15-FF \ + tests/pr/a2l17-FF \ + tests/pr/a3-0F \ + tests/pr/a3f-0F \ + tests/pr/a3f-0FF \ + tests/pr/a3f-FF \ + tests/pr/a3l15-t \ + tests/pr/a3l15f-t \ + tests/pr/a3l24f-lm \ + tests/pr/b2l15-FF \ + tests/pr/b2l17-FF \ + tests/pr/b3-0F \ + tests/pr/b3f-0F \ + tests/pr/b3f-0FF \ + tests/pr/b3f-FF \ + tests/pr/b3l15-t \ + tests/pr/b3l15f-t \ + tests/pr/b3l24f-lm \ + tests/pr/l24-FF \ + tests/pr/l24-t \ + tests/pr/l24f-t \ + tests/pr/loli \ + tests/pr/ml20-FF-t \ + tests/pr/ml24-FF \ + tests/pr/ml24-t \ + tests/pr/ml24-t-FF \ + tests/pr/ml24f-0F \ + tests/pr/ml24f-lm-lo \ + tests/pr/ml24f-t \ + tests/pr/ml24f-t-0F \ + tests/pr/n+2-5l24f-0FF \ + tests/pr/n+2l24f-0FF \ + tests/pr/n+2l24f-bl \ + tests/pr/n+3-7l24-FF \ + tests/pr/n+3l24f-0FF \ + tests/pr/n+3l24f-bl \ + tests/pr/n+3ml20f-bl-FF \ + tests/pr/n+3ml24f-bl-tn \ + tests/pr/n+3ml24f-tn-bl \ + tests/pr/n+4-8a2l17-FF \ + tests/pr/n+4b2l17f-0FF \ + tests/pr/n+5-8b3l17f-FF \ + tests/pr/n+5a3l13f-0FF \ + tests/pr/n+6a2l17-FF \ + tests/pr/n+6b3l13f-FF \ + tests/pr/n+7l24-FF \ + tests/pr/n+8l20-FF \ + tests/pr/nJml24f-lmlmlo \ + tests/pr/nJml24f-lmlolm \ + tests/pr/nN1+3l24f-bl \ + tests/pr/nN15l24f-bl \ + tests/pr/nSml20-bl-FF \ + tests/pr/nSml20-t-t-FF \ + tests/pr/nSml20-t-tFFFF \ + tests/pr/nSml24-bl-FF \ + tests/pr/nSml24-t-t-FF \ + tests/pr/nSml24-t-tFFFF \ + tests/pr/nl24f-bl \ + tests/pr/o3Jml24f-lm-lo \ + tests/pr/o3a3Sl24f-tn \ + tests/pr/o3a3Snl24f-tn \ + tests/pr/o3a3l24f-tn \ + tests/pr/o3b3Sl24f-tn \ + tests/pr/o3b3Snl24f-tn \ + tests/pr/o3b3l24f-tn \ + tests/pr/o3mSl24f-bl-tn \ + tests/pr/o3mSnl24fbltn \ + tests/pr/o3ml24f-bl-tn \ + tests/pr/t-0FF \ + tests/pr/t-FF \ + tests/pr/t-bl \ + tests/pr/t-t \ + tests/pr/tFFn \ + tests/pr/tFFt \ + tests/pr/tFFt-bl \ + tests/pr/tFFt-ll \ + tests/pr/tFFt-lm \ + tests/pr/tFnFt \ + tests/pr/t_notab \ + tests/pr/t_tab \ + tests/pr/t_tab_ \ + tests/pr/ta3-0FF \ + tests/pr/ta3-FF \ + tests/pr/tb3-0FF \ + tests/pr/tb3-FF \ + tests/pr/tn \ + tests/pr/tn2e5o3-t_tab \ + tests/pr/tn2e8-t_tab \ + tests/pr/tn2e8o3-t_tab \ + tests/pr/tn_2e8-t_tab \ + tests/pr/tn_2e8S-t_tab \ + tests/pr/tne8-t_tab \ + tests/pr/tne8o3-t_tab \ + tests/pr/tt-0FF \ + tests/pr/tt-FF \ + tests/pr/tt-bl \ + tests/pr/tt-t \ + tests/pr/tta3-0FF \ + tests/pr/tta3-FF \ + tests/pr/ttb3-0FF \ + tests/pr/ttb3-FF \ + tests/pr/w72l24f-ll diff --git a/tests/ls/abmon-align.sh b/tests/ls/abmon-align.sh index 4285d0759..086e1e6b8 100755 --- a/tests/ls/abmon-align.sh +++ b/tests/ls/abmon-align.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls for mon in $(seq -w 12); do diff --git a/tests/ls/block-size.sh b/tests/ls/block-size.sh index 99750201a..ff3378e38 100755 --- a/tests/ls/block-size.sh +++ b/tests/ls/block-size.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls TZ=UTC0 diff --git a/tests/ls/capability.sh b/tests/ls/capability.sh index d5d5ee047..82bc6adac 100755 --- a/tests/ls/capability.sh +++ b/tests/ls/capability.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_root_ diff --git a/tests/ls/color-clear-to-eol.sh b/tests/ls/color-clear-to-eol.sh index 5dc6d16be..8acbfa9f0 100755 --- a/tests/ls/color-clear-to-eol.sh +++ b/tests/ls/color-clear-to-eol.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls long_name=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo diff --git a/tests/ls/color-dtype-dir.sh b/tests/ls/color-dtype-dir.sh index 69dffd79c..60af3d518 100755 --- a/tests/ls/color-dtype-dir.sh +++ b/tests/ls/color-dtype-dir.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Don't let a different umask perturb the results. diff --git a/tests/ls/color-norm.sh b/tests/ls/color-norm.sh index 28366fb5c..2b6ba0e6a 100755 --- a/tests/ls/color-norm.sh +++ b/tests/ls/color-norm.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Don't let a different umask perturb the results. diff --git a/tests/ls/dangle.sh b/tests/ls/dangle.sh index dbc24476a..46cac9b96 100755 --- a/tests/ls/dangle.sh +++ b/tests/ls/dangle.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls ln -s no-such-file dangle || framework_failure_ diff --git a/tests/ls/dired.sh b/tests/ls/dired.sh index 6b55f435f..c2db8af3e 100755 --- a/tests/ls/dired.sh +++ b/tests/ls/dired.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir dir || framework_failure_ diff --git a/tests/ls/file-type.sh b/tests/ls/file-type.sh index 3bb7937a6..20afa9b29 100755 --- a/tests/ls/file-type.sh +++ b/tests/ls/file-type.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir sub diff --git a/tests/ls/follow-slink.sh b/tests/ls/follow-slink.sh index d3c0d6ef5..328318f81 100755 --- a/tests/ls/follow-slink.sh +++ b/tests/ls/follow-slink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Isolate output files from directory being listed diff --git a/tests/ls/getxattr-speedup.sh b/tests/ls/getxattr-speedup.sh index 967f7c95f..9fe98179b 100755 --- a/tests/ls/getxattr-speedup.sh +++ b/tests/ls/getxattr-speedup.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Replace each getxattr and lgetxattr call with a call to these stubs. diff --git a/tests/ls/infloop.sh b/tests/ls/infloop.sh index 9652112c8..ba311f1ef 100755 --- a/tests/ls/infloop.sh +++ b/tests/ls/infloop.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir loop || framework_failure_ diff --git a/tests/ls/inode.sh b/tests/ls/inode.sh index 8bf5ba153..66ebda59d 100755 --- a/tests/ls/inode.sh +++ b/tests/ls/inode.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls touch f || framework_failure_ diff --git a/tests/ls/m-option.sh b/tests/ls/m-option.sh index cc72e73cc..c1c78e2c9 100755 --- a/tests/ls/m-option.sh +++ b/tests/ls/m-option.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls seq 2000 > b || framework_failure_ diff --git a/tests/ls/multihardlink.sh b/tests/ls/multihardlink.sh index 68a587255..c621e9a41 100755 --- a/tests/ls/multihardlink.sh +++ b/tests/ls/multihardlink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls working_umask_or_skip_ diff --git a/tests/ls/nameless-uid.sh b/tests/ls/nameless-uid.sh index 5b45b091b..372f3811f 100755 --- a/tests/ls/nameless-uid.sh +++ b/tests/ls/nameless-uid.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_root_ diff --git a/tests/ls/no-arg.sh b/tests/ls/no-arg.sh index 8e7d1d616..4c45de974 100755 --- a/tests/ls/no-arg.sh +++ b/tests/ls/no-arg.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir -p dir/subdir || framework_failure_ diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh index 5e1e7887e..11d93365d 100755 --- a/tests/ls/no-cap.sh +++ b/tests/ls/no-cap.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_strace_ capget diff --git a/tests/ls/proc-selinux-segfault.sh b/tests/ls/proc-selinux-segfault.sh index da17ec4f1..824fafc11 100755 --- a/tests/ls/proc-selinux-segfault.sh +++ b/tests/ls/proc-selinux-segfault.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls f=/proc/sys diff --git a/tests/ls/readdir-mountpoint-inode.sh b/tests/ls/readdir-mountpoint-inode.sh index d46208ba6..bfe389841 100755 --- a/tests/ls/readdir-mountpoint-inode.sh +++ b/tests/ls/readdir-mountpoint-inode.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # We use --local here so as to not activate diff --git a/tests/ls/recursive.sh b/tests/ls/recursive.sh index 79fdc7f30..e0fe3a3d9 100755 --- a/tests/ls/recursive.sh +++ b/tests/ls/recursive.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir x y a b c a/1 a/2 a/3 || framework_failure_ diff --git a/tests/ls/root-rel-symlink-color.sh b/tests/ls/root-rel-symlink-color.sh index d7954323e..f4a50ad1b 100755 --- a/tests/ls/root-rel-symlink-color.sh +++ b/tests/ls/root-rel-symlink-color.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls symlink_to_rel= diff --git a/tests/ls/rt-1.sh b/tests/ls/rt-1.sh index f7d78df65..f66350085 100755 --- a/tests/ls/rt-1.sh +++ b/tests/ls/rt-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls touch date=1998-01-15 diff --git a/tests/ls/slink-acl.sh b/tests/ls/slink-acl.sh index ae9af5039..00ebf754c 100755 --- a/tests/ls/slink-acl.sh +++ b/tests/ls/slink-acl.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_setfacl_ diff --git a/tests/ls/stat-dtype.sh b/tests/ls/stat-dtype.sh index b84d5d51a..e22f5a4ba 100755 --- a/tests/ls/stat-dtype.sh +++ b/tests/ls/stat-dtype.sh @@ -21,7 +21,7 @@ # The trick is to create an un-stat'able symlink and to see if ls # can report its type nonetheless, using dirent.d_type. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Skip this test unless "." is on a file system with useful d_type info. diff --git a/tests/ls/stat-failed.sh b/tests/ls/stat-failed.sh index 464406bd5..c93295a56 100755 --- a/tests/ls/stat-failed.sh +++ b/tests/ls/stat-failed.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls skip_if_root_ diff --git a/tests/ls/stat-free-color.sh b/tests/ls/stat-free-color.sh index daff2eb5c..4758f0424 100755 --- a/tests/ls/stat-free-color.sh +++ b/tests/ls/stat-free-color.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_strace_ stat require_dirent_d_type_ diff --git a/tests/ls/stat-free-symlinks.sh b/tests/ls/stat-free-symlinks.sh index 8e04e2e8c..dbeee30f2 100755 --- a/tests/ls/stat-free-symlinks.sh +++ b/tests/ls/stat-free-symlinks.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls require_strace_ stat diff --git a/tests/ls/stat-vs-dirent.sh b/tests/ls/stat-vs-dirent.sh index 1dd6e6621..349ae8c26 100755 --- a/tests/ls/stat-vs-dirent.sh +++ b/tests/ls/stat-vs-dirent.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls diff --git a/tests/ls/symlink-slash.sh b/tests/ls/symlink-slash.sh index 28c7d32b2..048a7b8f1 100755 --- a/tests/ls/symlink-slash.sh +++ b/tests/ls/symlink-slash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir dir || framework_failure_ diff --git a/tests/ls/time-style-diag.sh b/tests/ls/time-style-diag.sh index ae41c9361..9fd6a84bb 100755 --- a/tests/ls/time-style-diag.sh +++ b/tests/ls/time-style-diag.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls ls -l --time-style=XX > out 2> err diff --git a/tests/ls/x-option.sh b/tests/ls/x-option.sh index 38faa72b8..06f1b5838 100755 --- a/tests/ls/x-option.sh +++ b/tests/ls/x-option.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls mkdir subdir || framework_failure_ diff --git a/tests/misc/arch.sh b/tests/misc/arch.sh index e1d730897..787ac1a9c 100755 --- a/tests/misc/arch.sh +++ b/tests/misc/arch.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ arch require_built_ arch diff --git a/tests/misc/cat-buf.sh b/tests/misc/cat-buf.sh index 2b6ba2a64..c8fbcd21e 100755 --- a/tests/misc/cat-buf.sh +++ b/tests/misc/cat-buf.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cat # Use a fifo rather than a pipe in the tests below diff --git a/tests/misc/cat-proc.sh b/tests/misc/cat-proc.sh index 082c727e0..0db0ebba4 100755 --- a/tests/misc/cat-proc.sh +++ b/tests/misc/cat-proc.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cat diff --git a/tests/misc/chcon-fail.sh b/tests/misc/chcon-fail.sh index d9f6c21b7..3e91afbb2 100755 --- a/tests/misc/chcon-fail.sh +++ b/tests/misc/chcon-fail.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chcon diff --git a/tests/misc/chcon.sh b/tests/misc/chcon.sh index 6b4458034..1a675b1c9 100755 --- a/tests/misc/chcon.sh +++ b/tests/misc/chcon.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chcon require_root_ require_selinux_ diff --git a/tests/misc/chroot-credentials.sh b/tests/misc/chroot-credentials.sh index bae9d4255..24842a885 100755 --- a/tests/misc/chroot-credentials.sh +++ b/tests/misc/chroot-credentials.sh @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chroot require_root_ diff --git a/tests/misc/chroot-fail.sh b/tests/misc/chroot-fail.sh index 6a5ecf32f..4294cb986 100755 --- a/tests/misc/chroot-fail.sh +++ b/tests/misc/chroot-fail.sh @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chroot diff --git a/tests/misc/close-stdout.sh b/tests/misc/close-stdout.sh index 8584dfea4..ed6a38a42 100755 --- a/tests/misc/close-stdout.sh +++ b/tests/misc/close-stdout.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm p=$abs_top_builddir diff --git a/tests/misc/csplit-1000.sh b/tests/misc/csplit-1000.sh index 217097e53..618575c54 100755 --- a/tests/misc/csplit-1000.sh +++ b/tests/misc/csplit-1000.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ csplit # Before coreutils-8.7, this would overrun the 6-byte filename_space buffer. diff --git a/tests/misc/csplit-heap.sh b/tests/misc/csplit-heap.sh index f12f9fe0d..cc86ce9f1 100755 --- a/tests/misc/csplit-heap.sh +++ b/tests/misc/csplit-heap.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ csplit require_ulimit_ diff --git a/tests/misc/csplit.sh b/tests/misc/csplit.sh index aea2e918f..28f07c905 100755 --- a/tests/misc/csplit.sh +++ b/tests/misc/csplit.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ csplit diff --git a/tests/misc/date-sec.sh b/tests/misc/date-sec.sh index a46b47903..8a8c8cc66 100755 --- a/tests/misc/date-sec.sh +++ b/tests/misc/date-sec.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ date diff --git a/tests/misc/env-null.sh b/tests/misc/env-null.sh index 0190bf413..844b4a88e 100755 --- a/tests/misc/env-null.sh +++ b/tests/misc/env-null.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ env printenv # POSIX is clear that environ may, but need not be, sorted. diff --git a/tests/misc/env.sh b/tests/misc/env.sh index 6f8c064ce..2a4ac3e79 100755 --- a/tests/misc/env.sh +++ b/tests/misc/env.sh @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ env diff --git a/tests/misc/false-status.sh b/tests/misc/false-status.sh index d192bbd7e..6af185958 100755 --- a/tests/misc/false-status.sh +++ b/tests/misc/false-status.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ false false --version > /dev/null && fail=1 diff --git a/tests/misc/groups-dash.sh b/tests/misc/groups-dash.sh index 24e7b9a79..efaef1215 100755 --- a/tests/misc/groups-dash.sh +++ b/tests/misc/groups-dash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ groups require_built_ groups diff --git a/tests/misc/groups-version.sh b/tests/misc/groups-version.sh index 9a8bf3927..c06c0b161 100755 --- a/tests/misc/groups-version.sh +++ b/tests/misc/groups-version.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ groups require_built_ groups diff --git a/tests/misc/head-c.sh b/tests/misc/head-c.sh index 32f86d2f3..a79ff1b93 100755 --- a/tests/misc/head-c.sh +++ b/tests/misc/head-c.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ head echo abc > in || framework_failure_ diff --git a/tests/misc/head-pos.sh b/tests/misc/head-pos.sh index fa3284e90..e4043fc9d 100755 --- a/tests/misc/head-pos.sh +++ b/tests/misc/head-pos.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ head (echo a; echo b) > in || framework_failure_ diff --git a/tests/misc/help-version.sh b/tests/misc/help-version.sh index f2ac0e9bb..ebbaff5f3 100755 --- a/tests/misc/help-version.sh +++ b/tests/misc/help-version.sh @@ -23,7 +23,7 @@ test "x$SHELL" = x && SHELL=/bin/sh export SHELL -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src expected_failure_status_chroot=125 expected_failure_status_env=125 diff --git a/tests/misc/id-context.sh b/tests/misc/id-context.sh index 73645a0ec..225cb7ad8 100755 --- a/tests/misc/id-context.sh +++ b/tests/misc/id-context.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ id # Require selinux - when selinux is disabled, id never prints scontext. require_selinux_ diff --git a/tests/misc/id-groups.sh b/tests/misc/id-groups.sh index 815dd5529..c642929d8 100755 --- a/tests/misc/id-groups.sh +++ b/tests/misc/id-groups.sh @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ id id -G $(id -nu) || fail=1 diff --git a/tests/misc/id-setgid.sh b/tests/misc/id-setgid.sh index 12fab381b..30aaffc8a 100755 --- a/tests/misc/id-setgid.sh +++ b/tests/misc/id-setgid.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ id require_root_ diff --git a/tests/misc/ls-time.sh b/tests/misc/ls-time.sh index 7d1f205fc..2eaa37dc2 100755 --- a/tests/misc/ls-time.sh +++ b/tests/misc/ls-time.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls # Avoid any possible glitches due to daylight-saving changes near the diff --git a/tests/misc/md5sum-bsd.sh b/tests/misc/md5sum-bsd.sh index ce4117679..1337c3db4 100755 --- a/tests/misc/md5sum-bsd.sh +++ b/tests/misc/md5sum-bsd.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ md5sum ## BSD alternate format tests ## diff --git a/tests/misc/md5sum-parallel.sh b/tests/misc/md5sum-parallel.sh index 0bf5fa9ca..ee9f575d3 100755 --- a/tests/misc/md5sum-parallel.sh +++ b/tests/misc/md5sum-parallel.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ md5sum (mkdir tmp && cd tmp && seq 500 | xargs touch) diff --git a/tests/misc/mknod.sh b/tests/misc/mknod.sh index b9e33ad2d..1378b57cd 100755 --- a/tests/misc/mknod.sh +++ b/tests/misc/mknod.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mknod # Ensure fifos are supported diff --git a/tests/misc/nice-fail.sh b/tests/misc/nice-fail.sh index 599c981f2..252c79a64 100755 --- a/tests/misc/nice-fail.sh +++ b/tests/misc/nice-fail.sh @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ nice diff --git a/tests/misc/nice.sh b/tests/misc/nice.sh index ac8ea04ea..a73e371c2 100755 --- a/tests/misc/nice.sh +++ b/tests/misc/nice.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ nice tests=' diff --git a/tests/misc/nl.sh b/tests/misc/nl.sh index b5a4ac635..1239643d0 100755 --- a/tests/misc/nl.sh +++ b/tests/misc/nl.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ nl diff --git a/tests/misc/nohup.sh b/tests/misc/nohup.sh index 76f676d81..2f3fb4e46 100755 --- a/tests/misc/nohup.sh +++ b/tests/misc/nohup.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ nohup diff --git a/tests/misc/nproc-avail.sh b/tests/misc/nproc-avail.sh index cf0846cc9..86b7aa194 100755 --- a/tests/misc/nproc-avail.sh +++ b/tests/misc/nproc-avail.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ nproc all=$(nproc --all) diff --git a/tests/misc/nproc-positive.sh b/tests/misc/nproc-positive.sh index d930fb892..4737b7c3a 100755 --- a/tests/misc/nproc-positive.sh +++ b/tests/misc/nproc-positive.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ nproc for mode in --all ''; do diff --git a/tests/misc/od-N.sh b/tests/misc/od-N.sh index 00d956a5f..81d8b6678 100755 --- a/tests/misc/od-N.sh +++ b/tests/misc/od-N.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ od echo abcdefg > in || framework_failure_ diff --git a/tests/misc/od-float.sh b/tests/misc/od-float.sh index a23a8f358..3b1ae91b6 100755 --- a/tests/misc/od-float.sh +++ b/tests/misc/od-float.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ od export LC_ALL=C diff --git a/tests/misc/od-multiple-t.sh b/tests/misc/od-multiple-t.sh index 049273cdf..f7cbc97f1 100755 --- a/tests/misc/od-multiple-t.sh +++ b/tests/misc/od-multiple-t.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ od # Choose 48 bytes for the input, as that is lcm for 1, 2, 4, 8, 12, 16; diff --git a/tests/misc/od-x8.sh b/tests/misc/od-x8.sh index 98a9fe979..70379426d 100755 --- a/tests/misc/od-x8.sh +++ b/tests/misc/od-x8.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ od od -t x8 /dev/null >/dev/null || diff --git a/tests/misc/pathchk1.sh b/tests/misc/pathchk1.sh index 373b545de..ccc97edbe 100755 --- a/tests/misc/pathchk1.sh +++ b/tests/misc/pathchk1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ pathchk skip_if_root_ diff --git a/tests/misc/printenv.sh b/tests/misc/printenv.sh index bbce8ef0e..95085f10f 100755 --- a/tests/misc/printenv.sh +++ b/tests/misc/printenv.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ printenv # Without arguments, printenv behaves like env. Some shells provide diff --git a/tests/misc/printf-hex.sh b/tests/misc/printf-hex.sh index 23a218faf..82b48975e 100755 --- a/tests/misc/printf-hex.sh +++ b/tests/misc/printf-hex.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ printf env printf '\x7e3\n' > out || fail=1 diff --git a/tests/misc/printf-surprise.sh b/tests/misc/printf-surprise.sh index b6f627598..ad01a618a 100755 --- a/tests/misc/printf-surprise.sh +++ b/tests/misc/printf-surprise.sh @@ -18,7 +18,7 @@ prog=printf -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ printf require_ulimit_ diff --git a/tests/misc/printf.sh b/tests/misc/printf.sh index 987e452ae..5a272b658 100755 --- a/tests/misc/printf.sh +++ b/tests/misc/printf.sh @@ -18,7 +18,7 @@ prog='env printf' -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ printf getlimits_ diff --git a/tests/misc/ptx-overrun.sh b/tests/misc/ptx-overrun.sh index e7eaf0b3d..345065772 100755 --- a/tests/misc/ptx-overrun.sh +++ b/tests/misc/ptx-overrun.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ptx # Using a long file name makes an abort more likely. diff --git a/tests/misc/pwd-long.sh b/tests/misc/pwd-long.sh index 051509a7d..456c64b5d 100755 --- a/tests/misc/pwd-long.sh +++ b/tests/misc/pwd-long.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ pwd require_readable_root_ @@ -28,7 +28,7 @@ export ARGV_0 # Don't use CuTmpdir here, since File::Temp's use of rmtree can't # remove the deep tree we create. -$PERL -Tw -I"$abs_srcdir" -MCuSkip -- - <<\EOF +$PERL -Tw -I"$abs_srcdir/tests" -MCuSkip -- - <<\EOF # Show that pwd works even when the length of the resulting # directory name is longer than PATH_MAX. diff --git a/tests/misc/pwd-option.sh b/tests/misc/pwd-option.sh index a7a4737e5..bd7c6a693 100755 --- a/tests/misc/pwd-option.sh +++ b/tests/misc/pwd-option.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ pwd mkdir -p a/b || framework_failure_ diff --git a/tests/misc/readlink-fp-loop.sh b/tests/misc/readlink-fp-loop.sh index 65fab7827..b222a6df4 100755 --- a/tests/misc/readlink-fp-loop.sh +++ b/tests/misc/readlink-fp-loop.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ readlink cwd=$("$abs_top_builddir/src/pwd") diff --git a/tests/misc/readlink-root.sh b/tests/misc/readlink-root.sh index f69bad6ad..6a12e2fd8 100755 --- a/tests/misc/readlink-root.sh +++ b/tests/misc/readlink-root.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ readlink stat_single=$(stat -c %d:%i /) || framework_failure_ diff --git a/tests/misc/realpath.sh b/tests/misc/realpath.sh index 9484ac4c8..43445f7f5 100755 --- a/tests/misc/realpath.sh +++ b/tests/misc/realpath.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ realpath stat_single=$(stat -c %d:%i /) || framework_failure_ diff --git a/tests/misc/runcon-no-reorder.sh b/tests/misc/runcon-no-reorder.sh index 351896ef8..391974a26 100755 --- a/tests/misc/runcon-no-reorder.sh +++ b/tests/misc/runcon-no-reorder.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ runcon diag='runcon: runcon may be used only on a SELinux kernel' diff --git a/tests/misc/selinux.sh b/tests/misc/selinux.sh index 12ae15f4e..c2edbea9e 100755 --- a/tests/misc/selinux.sh +++ b/tests/misc/selinux.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ chcon cp ls mv stat require_root_ diff --git a/tests/misc/seq-long-double.sh b/tests/misc/seq-long-double.sh index 5a511d709..976aaffbb 100755 --- a/tests/misc/seq-long-double.sh +++ b/tests/misc/seq-long-double.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ seq getlimits_ diff --git a/tests/misc/shred-exact.sh b/tests/misc/shred-exact.sh index 22d14c30d..32d917864 100755 --- a/tests/misc/shred-exact.sh +++ b/tests/misc/shred-exact.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ shred diff --git a/tests/misc/shred-passes.sh b/tests/misc/shred-passes.sh index 4ff80d749..50ae96d94 100755 --- a/tests/misc/shred-passes.sh +++ b/tests/misc/shred-passes.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ shred diff --git a/tests/misc/shred-remove.sh b/tests/misc/shred-remove.sh index c060a21cb..e6f0752e2 100755 --- a/tests/misc/shred-remove.sh +++ b/tests/misc/shred-remove.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ shred skip_if_root_ diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh index 243c0498d..c98e25aa9 100755 --- a/tests/misc/shuf.sh +++ b/tests/misc/shuf.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ shuf getlimits_ diff --git a/tests/misc/sort-NaN-infloop.sh b/tests/misc/sort-NaN-infloop.sh index e64d38599..9a8c4644a 100755 --- a/tests/misc/sort-NaN-infloop.sh +++ b/tests/misc/sort-NaN-infloop.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort echo nan > F || fail=1 diff --git a/tests/misc/sort-benchmark-random.sh b/tests/misc/sort-benchmark-random.sh index 9eb9a63f9..bdd1cc575 100755 --- a/tests/misc/sort-benchmark-random.sh +++ b/tests/misc/sort-benchmark-random.sh @@ -18,7 +18,7 @@ # Written by Glen Lenker. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort very_expensive_ diff --git a/tests/misc/sort-compress-hang.sh b/tests/misc/sort-compress-hang.sh index e1b8ff0f5..a104689cd 100755 --- a/tests/misc/sort-compress-hang.sh +++ b/tests/misc/sort-compress-hang.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort very_expensive_ diff --git a/tests/misc/sort-compress-proc.sh b/tests/misc/sort-compress-proc.sh index 7ee0fd1f5..c800fcb14 100755 --- a/tests/misc/sort-compress-proc.sh +++ b/tests/misc/sort-compress-proc.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort expensive_ diff --git a/tests/misc/sort-compress.sh b/tests/misc/sort-compress.sh index 00dcf06ac..324998200 100755 --- a/tests/misc/sort-compress.sh +++ b/tests/misc/sort-compress.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort seq -w 2000 > exp || framework_failure_ diff --git a/tests/misc/sort-continue.sh b/tests/misc/sort-continue.sh index 1491dbf65..184c2f7fe 100755 --- a/tests/misc/sort-continue.sh +++ b/tests/misc/sort-continue.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort # Skip the test when running under valgrind. diff --git a/tests/misc/sort-debug-keys.sh b/tests/misc/sort-debug-keys.sh index a284e84c3..c8ceecbc6 100755 --- a/tests/misc/sort-debug-keys.sh +++ b/tests/misc/sort-debug-keys.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort number() { cat -n | sed 's/^ *//'; } diff --git a/tests/misc/sort-debug-warn.sh b/tests/misc/sort-debug-warn.sh index 504a2d2bc..4c195bea5 100755 --- a/tests/misc/sort-debug-warn.sh +++ b/tests/misc/sort-debug-warn.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort cat <<\EOF > exp diff --git a/tests/misc/sort-discrim.sh b/tests/misc/sort-discrim.sh index fced20495..af457ce2e 100755 --- a/tests/misc/sort-discrim.sh +++ b/tests/misc/sort-discrim.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort # Set limit variables. diff --git a/tests/misc/sort-exit-early.sh b/tests/misc/sort-exit-early.sh index 5ad6d41aa..ce5f498bf 100755 --- a/tests/misc/sort-exit-early.sh +++ b/tests/misc/sort-exit-early.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort skip_if_root_ diff --git a/tests/misc/sort-float.sh b/tests/misc/sort-float.sh index b585b9bf1..67e076748 100755 --- a/tests/misc/sort-float.sh +++ b/tests/misc/sort-float.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort # Return 0 if LDBL_MIN is smaller than DBL_MIN, else 1. diff --git a/tests/misc/sort-merge-fdlimit.sh b/tests/misc/sort-merge-fdlimit.sh index 7ce109c1a..d3f8cf388 100755 --- a/tests/misc/sort-merge-fdlimit.sh +++ b/tests/misc/sort-merge-fdlimit.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort require_ulimit_ diff --git a/tests/misc/sort-month.sh b/tests/misc/sort-month.sh index fa1e69574..18e5c2637 100755 --- a/tests/misc/sort-month.sh +++ b/tests/misc/sort-month.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort locale --version >/dev/null 2>&1 || diff --git a/tests/misc/sort-rand.sh b/tests/misc/sort-rand.sh index 1782a9acc..56de19a46 100755 --- a/tests/misc/sort-rand.sh +++ b/tests/misc/sort-rand.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort seq 100 > in || framework_failure_ diff --git a/tests/misc/sort-spinlock-abuse.sh b/tests/misc/sort-spinlock-abuse.sh index 628326fd7..7ac43f849 100755 --- a/tests/misc/sort-spinlock-abuse.sh +++ b/tests/misc/sort-spinlock-abuse.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort # This isn't terribly expensive, but it must not be run under heavy load. diff --git a/tests/misc/sort-stale-thread-mem.sh b/tests/misc/sort-stale-thread-mem.sh index 05cc9ba1c..3ed0b6e7f 100755 --- a/tests/misc/sort-stale-thread-mem.sh +++ b/tests/misc/sort-stale-thread-mem.sh @@ -18,7 +18,7 @@ # written by Jim Meyering and Paul Eggert -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort very_expensive_ diff --git a/tests/misc/sort-u-FMR.sh b/tests/misc/sort-u-FMR.sh index 303b4291c..d6285661d 100755 --- a/tests/misc/sort-u-FMR.sh +++ b/tests/misc/sort-u-FMR.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort require_valgrind_ diff --git a/tests/misc/sort-unique-segv.sh b/tests/misc/sort-unique-segv.sh index b853cfe43..5ef0d02bd 100755 --- a/tests/misc/sort-unique-segv.sh +++ b/tests/misc/sort-unique-segv.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || diff --git a/tests/misc/sort-unique.sh b/tests/misc/sort-unique.sh index 275cbeb02..a37934837 100755 --- a/tests/misc/sort-unique.sh +++ b/tests/misc/sort-unique.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort cat > in <<\EOF diff --git a/tests/misc/sort-version.sh b/tests/misc/sort-version.sh index cb9acab71..84b1606ef 100755 --- a/tests/misc/sort-version.sh +++ b/tests/misc/sort-version.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sort cat > in << _EOF_ diff --git a/tests/misc/stat-birthtime.sh b/tests/misc/stat-birthtime.sh index dd68e675e..524de88ed 100755 --- a/tests/misc/stat-birthtime.sh +++ b/tests/misc/stat-birthtime.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stat # Whether birthtime is supported or not, it better not change even when diff --git a/tests/misc/stat-fmt.sh b/tests/misc/stat-fmt.sh index 8952a7abb..bc23555fc 100755 --- a/tests/misc/stat-fmt.sh +++ b/tests/misc/stat-fmt.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stat diff --git a/tests/misc/stat-hyphen.sh b/tests/misc/stat-hyphen.sh index a6b524362..292e70eb1 100755 --- a/tests/misc/stat-hyphen.sh +++ b/tests/misc/stat-hyphen.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stat printf -- '-\n' > exp || framework_failure_ diff --git a/tests/misc/stat-mount.sh b/tests/misc/stat-mount.sh index c93d8dcb5..d262ceb5f 100755 --- a/tests/misc/stat-mount.sh +++ b/tests/misc/stat-mount.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stat df_mnt=$(df -P . | sed -n '2s/.* \([^ ]*$\)/\1/p') diff --git a/tests/misc/stat-nanoseconds.sh b/tests/misc/stat-nanoseconds.sh index 1afb610f9..0659b59d5 100755 --- a/tests/misc/stat-nanoseconds.sh +++ b/tests/misc/stat-nanoseconds.sh @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. print_ver_ stat -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src # Set this to avoid problems with weird time zones. TZ=UTC0 diff --git a/tests/misc/stat-slash.sh b/tests/misc/stat-slash.sh index ff122eb0f..ee52bebc3 100755 --- a/tests/misc/stat-slash.sh +++ b/tests/misc/stat-slash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stat touch file || framework_failure_ diff --git a/tests/misc/stdbuf.sh b/tests/misc/stdbuf.sh index 3164df1b0..ecc211e3d 100755 --- a/tests/misc/stdbuf.sh +++ b/tests/misc/stdbuf.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stdbuf getlimits_ diff --git a/tests/misc/stty-invalid.sh b/tests/misc/stty-invalid.sh index 3b035ecef..d07e3ad64 100755 --- a/tests/misc/stty-invalid.sh +++ b/tests/misc/stty-invalid.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stty require_controlling_input_terminal_ trap '' TTOU # Ignore SIGTTOU diff --git a/tests/misc/stty-pairs.sh b/tests/misc/stty-pairs.sh index e59da0435..539867323 100755 --- a/tests/misc/stty-pairs.sh +++ b/tests/misc/stty-pairs.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stty expensive_ diff --git a/tests/misc/stty-row-col.sh b/tests/misc/stty-row-col.sh index d7151d5b7..f5a42d5b7 100755 --- a/tests/misc/stty-row-col.sh +++ b/tests/misc/stty-row-col.sh @@ -28,7 +28,7 @@ export COLUMNS LC_ALL=C export LC_ALL -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stty require_controlling_input_terminal_ diff --git a/tests/misc/stty.sh b/tests/misc/stty.sh index ae6565649..6d04c783b 100755 --- a/tests/misc/stty.sh +++ b/tests/misc/stty.sh @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure there's a tty on stdin. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ stty require_controlling_input_terminal_ diff --git a/tests/misc/sum-sysv.sh b/tests/misc/sum-sysv.sh index 9cdf07fc6..147749c95 100755 --- a/tests/misc/sum-sysv.sh +++ b/tests/misc/sum-sysv.sh @@ -22,7 +22,7 @@ LC_ALL=C export LC_ALL -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ sum require_perl_ diff --git a/tests/misc/tac-2-nonseekable.sh b/tests/misc/tac-2-nonseekable.sh index f980f3b8c..32fa90d1a 100755 --- a/tests/misc/tac-2-nonseekable.sh +++ b/tests/misc/tac-2-nonseekable.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tac echo x | tac - - > out 2> err || fail=1 diff --git a/tests/misc/tac-continue.sh b/tests/misc/tac-continue.sh index d9cc550ac..10129bf4f 100755 --- a/tests/misc/tac-continue.sh +++ b/tests/misc/tac-continue.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tac # See if the envvar is defined. diff --git a/tests/misc/tee-dash.sh b/tests/misc/tee-dash.sh index 8ee0820bd..bcc1e1383 100755 --- a/tests/misc/tee-dash.sh +++ b/tests/misc/tee-dash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tee tee - </dev/null || fail=1 diff --git a/tests/misc/tee.sh b/tests/misc/tee.sh index 4c17316d3..d461810f1 100755 --- a/tests/misc/tee.sh +++ b/tests/misc/tee.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tee echo line >sample || framework_failure_ diff --git a/tests/misc/timeout-group.sh b/tests/misc/timeout-group.sh index 7a08bb3a5..4cefc33bf 100755 --- a/tests/misc/timeout-group.sh +++ b/tests/misc/timeout-group.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ timeout # construct a program group hierarchy as follows: diff --git a/tests/misc/timeout-parameters.sh b/tests/misc/timeout-parameters.sh index c7d663092..e78c89ffc 100755 --- a/tests/misc/timeout-parameters.sh +++ b/tests/misc/timeout-parameters.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ timeout getlimits_ diff --git a/tests/misc/timeout.sh b/tests/misc/timeout.sh index 5f4e9ec2a..57a4e15d0 100755 --- a/tests/misc/timeout.sh +++ b/tests/misc/timeout.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ timeout # no timeout diff --git a/tests/misc/tr-case-class.sh b/tests/misc/tr-case-class.sh index 2f70f4eb1..ef00a284a 100755 --- a/tests/misc/tr-case-class.sh +++ b/tests/misc/tr-case-class.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tr # Ensure we support translation of case classes with extension diff --git a/tests/misc/truncate-dangling-symlink.sh b/tests/misc/truncate-dangling-symlink.sh index d9175d4eb..b077fd09a 100755 --- a/tests/misc/truncate-dangling-symlink.sh +++ b/tests/misc/truncate-dangling-symlink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate ln -s truncate-target t-symlink diff --git a/tests/misc/truncate-dir-fail.sh b/tests/misc/truncate-dir-fail.sh index 54a31479f..aad0ff4ed 100755 --- a/tests/misc/truncate-dir-fail.sh +++ b/tests/misc/truncate-dir-fail.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate # truncate on dir not allowed diff --git a/tests/misc/truncate-fail-diag.sh b/tests/misc/truncate-fail-diag.sh index 994ee0b8b..5957fbec9 100755 --- a/tests/misc/truncate-fail-diag.sh +++ b/tests/misc/truncate-fail-diag.sh @@ -20,7 +20,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate skip_if_root_ diff --git a/tests/misc/truncate-fifo.sh b/tests/misc/truncate-fifo.sh index 6588f0a27..bd701dbb6 100755 --- a/tests/misc/truncate-fifo.sh +++ b/tests/misc/truncate-fifo.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate mkfifo_or_skip_ fifo diff --git a/tests/misc/truncate-no-create-missing.sh b/tests/misc/truncate-no-create-missing.sh index 56b2ac187..eccb35db1 100755 --- a/tests/misc/truncate-no-create-missing.sh +++ b/tests/misc/truncate-no-create-missing.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate diff --git a/tests/misc/truncate-overflow.sh b/tests/misc/truncate-overflow.sh index 9ec353fa8..8d32d4940 100755 --- a/tests/misc/truncate-overflow.sh +++ b/tests/misc/truncate-overflow.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate getlimits_ diff --git a/tests/misc/truncate-owned-by-other.sh b/tests/misc/truncate-owned-by-other.sh index 931608698..520fa69a9 100755 --- a/tests/misc/truncate-owned-by-other.sh +++ b/tests/misc/truncate-owned-by-other.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate require_root_ diff --git a/tests/misc/truncate-parameters.sh b/tests/misc/truncate-parameters.sh index 13a8475e6..f52471127 100755 --- a/tests/misc/truncate-parameters.sh +++ b/tests/misc/truncate-parameters.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate diff --git a/tests/misc/truncate-relative.sh b/tests/misc/truncate-relative.sh index 19543db6b..353dd84b8 100755 --- a/tests/misc/truncate-relative.sh +++ b/tests/misc/truncate-relative.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ truncate diff --git a/tests/misc/uniq-perf.sh b/tests/misc/uniq-perf.sh index 57794c3b0..99739d7d9 100755 --- a/tests/misc/uniq-perf.sh +++ b/tests/misc/uniq-perf.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ uniq seq 100 > in || fail=1 diff --git a/tests/misc/wc-files0.sh b/tests/misc/wc-files0.sh index 9a0d0501d..e6e6a32e4 100755 --- a/tests/misc/wc-files0.sh +++ b/tests/misc/wc-files0.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ wc echo 2 > 2b || framework_failure_ diff --git a/tests/misc/wc-parallel.sh b/tests/misc/wc-parallel.sh index 6611b47c2..4893b3562 100755 --- a/tests/misc/wc-parallel.sh +++ b/tests/misc/wc-parallel.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ wc (mkdir tmp && cd tmp && seq 2000 | xargs touch) diff --git a/tests/misc/xattr.sh b/tests/misc/xattr.sh index ff50e6c9c..9871adf8c 100755 --- a/tests/misc/xattr.sh +++ b/tests/misc/xattr.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv ginstall # Skip this test if cp was built without xattr support: @@ -28,7 +28,7 @@ cp --preserve=xattr -n src dest \ # this code was taken from test mv/backup-is-src cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" b_other="$other_partition_tmpdir/b" rm -f "$b_other" || framework_failure_ diff --git a/tests/mkdir/p-1.sh b/tests/mkdir/p-1.sh index cd8e67606..0ae322c58 100755 --- a/tests/mkdir/p-1.sh +++ b/tests/mkdir/p-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkdir --parents "$(pwd)/t" || fail=1 diff --git a/tests/mkdir/p-2.sh b/tests/mkdir/p-2.sh index d0c487ec9..6ddedbc66 100755 --- a/tests/mkdir/p-2.sh +++ b/tests/mkdir/p-2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkdir --parents "$(pwd)/t/u" || fail=1 diff --git a/tests/mkdir/p-3.sh b/tests/mkdir/p-3.sh index 7031b2ede..a80fa379c 100755 --- a/tests/mkdir/p-3.sh +++ b/tests/mkdir/p-3.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_root_ diff --git a/tests/mkdir/p-slashdot.sh b/tests/mkdir/p-slashdot.sh index 76d21d055..e59198a6a 100755 --- a/tests/mkdir/p-slashdot.sh +++ b/tests/mkdir/p-slashdot.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir diff --git a/tests/mkdir/p-thru-slink.sh b/tests/mkdir/p-thru-slink.sh index 3f5993248..3c8baf68f 100755 --- a/tests/mkdir/p-thru-slink.sh +++ b/tests/mkdir/p-thru-slink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir ln -s . slink || framework_failure_ diff --git a/tests/mkdir/p-v.sh b/tests/mkdir/p-v.sh index d6dcfdd87..ea372464c 100755 --- a/tests/mkdir/p-v.sh +++ b/tests/mkdir/p-v.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkdir -pv foo/a/b/c/d >out || fail=1 diff --git a/tests/mkdir/parents.sh b/tests/mkdir/parents.sh index 0543e675e..876c5a049 100755 --- a/tests/mkdir/parents.sh +++ b/tests/mkdir/parents.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_setgid_ diff --git a/tests/mkdir/perm.sh b/tests/mkdir/perm.sh index f9b207f81..3cdd37f84 100755 --- a/tests/mkdir/perm.sh +++ b/tests/mkdir/perm.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_setgid_ diff --git a/tests/mkdir/selinux.sh b/tests/mkdir/selinux.sh index 763236259..bb1aab97b 100755 --- a/tests/mkdir/selinux.sh +++ b/tests/mkdir/selinux.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir mkfifo mknod # Note: on an SELinux/enforcing system running mcstransd older than diff --git a/tests/mkdir/special-1.sh b/tests/mkdir/special-1.sh index d478930eb..d9305bb53 100755 --- a/tests/mkdir/special-1.sh +++ b/tests/mkdir/special-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir set_mode_string=u=rwx,g=rx,o=w,-s,+t diff --git a/tests/mkdir/t-slash.sh b/tests/mkdir/t-slash.sh index 7b3c1ba30..5645a077c 100755 --- a/tests/mkdir/t-slash.sh +++ b/tests/mkdir/t-slash.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir diff --git a/tests/mkdir/writable-under-readonly.sh b/tests/mkdir/writable-under-readonly.sh index 93e46d5b2..16f4a9279 100755 --- a/tests/mkdir/writable-under-readonly.sh +++ b/tests/mkdir/writable-under-readonly.sh @@ -24,7 +24,7 @@ # # Demonstrate the problem, as root: -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir require_root_ diff --git a/tests/mv/acl.sh b/tests/mv/acl.sh index 2354ed967..9fe26e4b9 100755 --- a/tests/mv/acl.sh +++ b/tests/mv/acl.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv getfacl setfacl require_acl_ @@ -27,7 +27,7 @@ grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null || skip_ "insufficient ACL support" cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" touch file || framework_failure_ t1=$other_partition_tmpdir/t1 diff --git a/tests/mv/atomic.sh b/tests/mv/atomic.sh index e5391c337..79894aca9 100755 --- a/tests/mv/atomic.sh +++ b/tests/mv/atomic.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv require_strace_ unlink diff --git a/tests/mv/atomic2.sh b/tests/mv/atomic2.sh index d9c55e2c9..139b02f6c 100755 --- a/tests/mv/atomic2.sh +++ b/tests/mv/atomic2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv require_strace_ unlink diff --git a/tests/mv/backup-dir.sh b/tests/mv/backup-dir.sh index 40f2c756a..7a486da66 100755 --- a/tests/mv/backup-dir.sh +++ b/tests/mv/backup-dir.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv mkdir A B || framework_failure_ diff --git a/tests/mv/backup-is-src.sh b/tests/mv/backup-is-src.sh index e1383a14d..0d4c3e7c0 100755 --- a/tests/mv/backup-is-src.sh +++ b/tests/mv/backup-is-src.sh @@ -16,10 +16,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" a="$other_partition_tmpdir/a" a2="$other_partition_tmpdir/a~" diff --git a/tests/mv/childproof.sh b/tests/mv/childproof.sh index efe7225d6..94fb5cdf0 100755 --- a/tests/mv/childproof.sh +++ b/tests/mv/childproof.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv ln skip_if_root_ diff --git a/tests/mv/diag.sh b/tests/mv/diag.sh index d7c287030..511f3b5da 100755 --- a/tests/mv/diag.sh +++ b/tests/mv/diag.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv touch f1 || framework_failure_ diff --git a/tests/mv/dir-file.sh b/tests/mv/dir-file.sh index fb1a59424..0704d0326 100755 --- a/tests/mv/dir-file.sh +++ b/tests/mv/dir-file.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv mkdir -p dir/file || framework_failure_ diff --git a/tests/mv/dir2dir.sh b/tests/mv/dir2dir.sh index 4322fd23d..4e3242b6e 100755 --- a/tests/mv/dir2dir.sh +++ b/tests/mv/dir2dir.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv mkdir -p a/t b/t || framework_failure_ diff --git a/tests/mv/dup-source.sh b/tests/mv/dup-source.sh index ea88a046e..641a2e418 100755 --- a/tests/mv/dup-source.sh +++ b/tests/mv/dup-source.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv skip_if_root_ diff --git a/tests/mv/force.sh b/tests/mv/force.sh index 6bed83bf9..dc6651a7d 100755 --- a/tests/mv/force.sh +++ b/tests/mv/force.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv ff=mvforce diff --git a/tests/mv/hard-2.sh b/tests/mv/hard-2.sh index e0fc174f0..276dbbb10 100755 --- a/tests/mv/hard-2.sh +++ b/tests/mv/hard-2.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv skip_if_root_ diff --git a/tests/mv/hard-3.sh b/tests/mv/hard-3.sh index a62167a07..4caec49d6 100755 --- a/tests/mv/hard-3.sh +++ b/tests/mv/hard-3.sh @@ -30,7 +30,7 @@ # directory, because it requires use of the --preserve=link option that # mv enables by default. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp skip_if_root_ diff --git a/tests/mv/hard-4.sh b/tests/mv/hard-4.sh index 645ead3c5..2bbc2cafc 100755 --- a/tests/mv/hard-4.sh +++ b/tests/mv/hard-4.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv touch a || framework_failure_ ln a b || framework_failure_ diff --git a/tests/mv/hard-link-1.sh b/tests/mv/hard-link-1.sh index 78a555ac9..386f2b524 100755 --- a/tests/mv/hard-link-1.sh +++ b/tests/mv/hard-link-1.sh @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" dir=hlink diff --git a/tests/mv/hard-verbose.sh b/tests/mv/hard-verbose.sh index 41c4187ea..85f2da7bd 100755 --- a/tests/mv/hard-verbose.sh +++ b/tests/mv/hard-verbose.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv touch x || framework_failure_ diff --git a/tests/mv/i-2.sh b/tests/mv/i-2.sh index f24801958..b85685076 100755 --- a/tests/mv/i-2.sh +++ b/tests/mv/i-2.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv skip_if_root_ diff --git a/tests/mv/i-3.sh b/tests/mv/i-3.sh index 3912842a2..073c070b1 100755 --- a/tests/mv/i-3.sh +++ b/tests/mv/i-3.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv require_controlling_input_terminal_ skip_if_root_ diff --git a/tests/mv/i-4.sh b/tests/mv/i-4.sh index 8ef6ca77b..4b1da69a6 100755 --- a/tests/mv/i-4.sh +++ b/tests/mv/i-4.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv for i in a b; do diff --git a/tests/mv/i-5.sh b/tests/mv/i-5.sh index 76cacabe3..773c47a8f 100755 --- a/tests/mv/i-5.sh +++ b/tests/mv/i-5.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv mkdir a || framework_failure_ diff --git a/tests/mv/i-link-no.sh b/tests/mv/i-link-no.sh index 4615eaabb..7a9894a85 100755 --- a/tests/mv/i-link-no.sh +++ b/tests/mv/i-link-no.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv mkdir a b || framework_failure_ diff --git a/tests/mv/into-self-2.sh b/tests/mv/into-self-2.sh index 3e6ace718..db57fecf1 100755 --- a/tests/mv/into-self-2.sh +++ b/tests/mv/into-self-2.sh @@ -18,10 +18,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" file="$other_partition_tmpdir/file" symlink=symlink diff --git a/tests/mv/into-self-3.sh b/tests/mv/into-self-3.sh index b2b8f8351..569b0819d 100755 --- a/tests/mv/into-self-3.sh +++ b/tests/mv/into-self-3.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv dir1=is3-dir1 diff --git a/tests/mv/into-self-4.sh b/tests/mv/into-self-4.sh index 5119e8fa3..86beb7270 100755 --- a/tests/mv/into-self-4.sh +++ b/tests/mv/into-self-4.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv touch file || framework_failure_ diff --git a/tests/mv/into-self.sh b/tests/mv/into-self.sh index 231d69c2c..06b36a440 100755 --- a/tests/mv/into-self.sh +++ b/tests/mv/into-self.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv dir=toself-dir diff --git a/tests/mv/leak-fd.sh b/tests/mv/leak-fd.sh index d349a3f11..1dd006fa4 100755 --- a/tests/mv/leak-fd.sh +++ b/tests/mv/leak-fd.sh @@ -18,11 +18,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # limit so don't run it by default. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv skip_if_root_ cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" # This test is relatively expensive, and might well evoke a # framework-failure on systems with a smaller command-line length diff --git a/tests/mv/mv-n.sh b/tests/mv/mv-n.sh index 9a9b1156a..89a62f66d 100755 --- a/tests/mv/mv-n.sh +++ b/tests/mv/mv-n.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv diff --git a/tests/mv/mv-special-1.sh b/tests/mv/mv-special-1.sh index dac55d0c2..d5914cb71 100755 --- a/tests/mv/mv-special-1.sh +++ b/tests/mv/mv-special-1.sh @@ -16,10 +16,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" null=mv-null dir=mv-dir diff --git a/tests/mv/no-target-dir.sh b/tests/mv/no-target-dir.sh index c1443cd3e..61cf48e99 100755 --- a/tests/mv/no-target-dir.sh +++ b/tests/mv/no-target-dir.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv mkdir -p d/sub empty src d2/sub e2 || framework_failure_ diff --git a/tests/mv/part-fail.sh b/tests/mv/part-fail.sh index 499a6b66f..6bfddb299 100755 --- a/tests/mv/part-fail.sh +++ b/tests/mv/part-fail.sh @@ -19,11 +19,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv skip_if_root_ cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" touch k "$other_partition_tmpdir/k" || framework_failure_ chmod u-w "$other_partition_tmpdir" || framework_failure_ diff --git a/tests/mv/part-hardlink.sh b/tests/mv/part-hardlink.sh index af773a23b..c93cd8577 100755 --- a/tests/mv/part-hardlink.sh +++ b/tests/mv/part-hardlink.sh @@ -19,10 +19,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" touch f || framework_failure_ ln f g || framework_failure_ diff --git a/tests/mv/part-rename.sh b/tests/mv/part-rename.sh index 19d9ecb75..33fdaa8c2 100755 --- a/tests/mv/part-rename.sh +++ b/tests/mv/part-rename.sh @@ -18,10 +18,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" mkdir foo || framework_failure_ diff --git a/tests/mv/part-symlink.sh b/tests/mv/part-symlink.sh index e57de3c96..1f9c81220 100755 --- a/tests/mv/part-symlink.sh +++ b/tests/mv/part-symlink.sh @@ -17,11 +17,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" # On NFS on Linux 2.6.9 at least we get: # mv: preserving permissions for 'rem_sl': Operation not supported diff --git a/tests/mv/partition-perm.sh b/tests/mv/partition-perm.sh index bbda9da7a..19864e4ab 100755 --- a/tests/mv/partition-perm.sh +++ b/tests/mv/partition-perm.sh @@ -16,10 +16,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" : > file chmod a=rwx file diff --git a/tests/mv/perm-1.sh b/tests/mv/perm-1.sh index 3a7944a66..dd7a99d29 100755 --- a/tests/mv/perm-1.sh +++ b/tests/mv/perm-1.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv skip_if_root_ diff --git a/tests/mv/sticky-to-xpart.sh b/tests/mv/sticky-to-xpart.sh index 6df65024e..c3a9bcdc5 100755 --- a/tests/mv/sticky-to-xpart.sh +++ b/tests/mv/sticky-to-xpart.sh @@ -19,12 +19,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv require_root_ cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" # Set up to run a test where non-root user tries to move a root-owned # file from a sticky tmpdir to a directory owned by that user on diff --git a/tests/mv/symlink-onto-hardlink-to-self.sh b/tests/mv/symlink-onto-hardlink-to-self.sh index f53f6ef44..77c7dc883 100755 --- a/tests/mv/symlink-onto-hardlink-to-self.sh +++ b/tests/mv/symlink-onto-hardlink-to-self.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv # Create a file f, and a symlink s1 to that file. diff --git a/tests/mv/symlink-onto-hardlink.sh b/tests/mv/symlink-onto-hardlink.sh index 2dac48401..675871d17 100755 --- a/tests/mv/symlink-onto-hardlink.sh +++ b/tests/mv/symlink-onto-hardlink.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv touch f || framework_failure_ diff --git a/tests/mv/to-symlink.sh b/tests/mv/to-symlink.sh index c203d7a4b..b0c9bab33 100755 --- a/tests/mv/to-symlink.sh +++ b/tests/mv/to-symlink.sh @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" rem_file="$other_partition_tmpdir/file" rem_symlink="$other_partition_tmpdir/symlink" diff --git a/tests/mv/trailing-slash.sh b/tests/mv/trailing-slash.sh index 26f880250..cec04839c 100755 --- a/tests/mv/trailing-slash.sh +++ b/tests/mv/trailing-slash.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv mkdir foo || framework_failure_ diff --git a/tests/mv/update.sh b/tests/mv/update.sh index f0beb4076..1514a8c12 100755 --- a/tests/mv/update.sh +++ b/tests/mv/update.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp mv echo old > old || framework_failure_ diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl index 259c9d6c2..f20241426 100755 --- a/tests/pr/pr-tests.pl +++ b/tests/pr/pr-tests.pl @@ -412,7 +412,7 @@ my @tv = ( # Convert the above old-style test vectors to the newer # format used by Coreutils.pm. -my $pfx = "$ENV{abs_srcdir}/pr"; +my $pfx = "$ENV{abs_srcdir}/tests/pr"; # Normalize otherwise-variable output page headers. my $common_option_prefix = '--date-format="-- Date/Time --" -h x'; diff --git a/tests/readlink/can-e.sh b/tests/readlink/can-e.sh index 32b75c595..ee7def672 100755 --- a/tests/readlink/can-e.sh +++ b/tests/readlink/can-e.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ readlink pwd=$(pwd) diff --git a/tests/readlink/can-f.sh b/tests/readlink/can-f.sh index 3f296010c..480ced0a6 100755 --- a/tests/readlink/can-f.sh +++ b/tests/readlink/can-f.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ readlink pwd=$(pwd) diff --git a/tests/readlink/can-m.sh b/tests/readlink/can-m.sh index 09a96f509..5ecc50459 100755 --- a/tests/readlink/can-m.sh +++ b/tests/readlink/can-m.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ readlink pwd=$(pwd) diff --git a/tests/readlink/rl-1.sh b/tests/readlink/rl-1.sh index 511a9890e..7730764b6 100755 --- a/tests/readlink/rl-1.sh +++ b/tests/readlink/rl-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ readlink mkdir subdir || framework_failure_ diff --git a/tests/rm/cycle.sh b/tests/rm/cycle.sh index 33e1283b6..3379f0b54 100755 --- a/tests/rm/cycle.sh +++ b/tests/rm/cycle.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/d-1.sh b/tests/rm/d-1.sh index f35e95125..0c8b1bcff 100755 --- a/tests/rm/d-1.sh +++ b/tests/rm/d-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir a || framework_failure_ diff --git a/tests/rm/d-2.sh b/tests/rm/d-2.sh index a63cff60d..b62c2ee71 100755 --- a/tests/rm/d-2.sh +++ b/tests/rm/d-2.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir d || framework_failure_ diff --git a/tests/rm/d-3.sh b/tests/rm/d-3.sh index 2f2cf7492..d5075f58e 100755 --- a/tests/rm/d-3.sh +++ b/tests/rm/d-3.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir d || framework_failure_ diff --git a/tests/rm/dangling-symlink.sh b/tests/rm/dangling-symlink.sh index 92a59066a..ad81231a2 100755 --- a/tests/rm/dangling-symlink.sh +++ b/tests/rm/dangling-symlink.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm ln -s no-file dangle diff --git a/tests/rm/deep-1.sh b/tests/rm/deep-1.sh index f739eb594..7a144ccf2 100755 --- a/tests/rm/deep-1.sh +++ b/tests/rm/deep-1.sh @@ -23,7 +23,7 @@ # If this test takes too long on your system, blame the OS. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm umask 022 diff --git a/tests/rm/deep-2.sh b/tests/rm/deep-2.sh index 266097741..5e6c1a1c3 100755 --- a/tests/rm/deep-2.sh +++ b/tests/rm/deep-2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm require_perl_ diff --git a/tests/rm/dir-no-w.sh b/tests/rm/dir-no-w.sh index ce33b98e5..4a1a54ae8 100755 --- a/tests/rm/dir-no-w.sh +++ b/tests/rm/dir-no-w.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir --mode=0500 unwritable-dir || framework_failure_ diff --git a/tests/rm/dir-nonrecur.sh b/tests/rm/dir-nonrecur.sh index 8876e9458..bdb8f5b35 100755 --- a/tests/rm/dir-nonrecur.sh +++ b/tests/rm/dir-nonrecur.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir d || framework_failure_ diff --git a/tests/rm/dot-rel.sh b/tests/rm/dot-rel.sh index fc693596a..fa9b960b9 100755 --- a/tests/rm/dot-rel.sh +++ b/tests/rm/dot-rel.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir a b || framework_failure_ diff --git a/tests/rm/empty-inacc.sh b/tests/rm/empty-inacc.sh index e23cb8553..24bdfe70b 100755 --- a/tests/rm/empty-inacc.sh +++ b/tests/rm/empty-inacc.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/ext3-perf.sh b/tests/rm/ext3-perf.sh index 97b0a17b3..f6be006eb 100755 --- a/tests/rm/ext3-perf.sh +++ b/tests/rm/ext3-perf.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm very_expensive_ diff --git a/tests/rm/f-1.sh b/tests/rm/f-1.sh index e1ed8d4fa..bfdb92a0e 100755 --- a/tests/rm/f-1.sh +++ b/tests/rm/f-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir -p d || framework_failure_ diff --git a/tests/rm/fail-2eperm.sh b/tests/rm/fail-2eperm.sh index fa2f43227..ab157aa85 100755 --- a/tests/rm/fail-2eperm.sh +++ b/tests/rm/fail-2eperm.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm require_root_ diff --git a/tests/rm/fail-eacces.sh b/tests/rm/fail-eacces.sh index 947dfac36..9defa0b17 100755 --- a/tests/rm/fail-eacces.sh +++ b/tests/rm/fail-eacces.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/hash.sh b/tests/rm/hash.sh index 344325e13..2185b2e71 100755 --- a/tests/rm/hash.sh +++ b/tests/rm/hash.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm expensive_ diff --git a/tests/rm/i-1.sh b/tests/rm/i-1.sh index 67df853f5..f4764f31e 100755 --- a/tests/rm/i-1.sh +++ b/tests/rm/i-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm t=t diff --git a/tests/rm/i-never.sh b/tests/rm/i-never.sh index 80e1fcd98..591c86d2c 100755 --- a/tests/rm/i-never.sh +++ b/tests/rm/i-never.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/i-no-r.sh b/tests/rm/i-no-r.sh index 6b22e1ca1..30fa732cf 100755 --- a/tests/rm/i-no-r.sh +++ b/tests/rm/i-no-r.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir dir || framework_failure_ diff --git a/tests/rm/ignorable.sh b/tests/rm/ignorable.sh index bcf3b7eb9..a6beaa47e 100755 --- a/tests/rm/ignorable.sh +++ b/tests/rm/ignorable.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/inaccessible.sh b/tests/rm/inaccessible.sh index 2f045815e..5a3f42e7b 100755 --- a/tests/rm/inaccessible.sh +++ b/tests/rm/inaccessible.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm # Skip this test if your system has neither the openat-style functions diff --git a/tests/rm/interactive-always.sh b/tests/rm/interactive-always.sh index 6312cba1c..a8aaaad0f 100755 --- a/tests/rm/interactive-always.sh +++ b/tests/rm/interactive-always.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \ diff --git a/tests/rm/interactive-once.sh b/tests/rm/interactive-once.sh index 982d1a4d3..4985c8461 100755 --- a/tests/rm/interactive-once.sh +++ b/tests/rm/interactive-once.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure_ diff --git a/tests/rm/ir-1.sh b/tests/rm/ir-1.sh index 01b33bc1e..60a24d182 100755 --- a/tests/rm/ir-1.sh +++ b/tests/rm/ir-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm t=t diff --git a/tests/rm/isatty.sh b/tests/rm/isatty.sh index f28653cc8..799d83917 100755 --- a/tests/rm/isatty.sh +++ b/tests/rm/isatty.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/many-dir-entries-vs-OOM.sh b/tests/rm/many-dir-entries-vs-OOM.sh index b5f10dac4..d2ee152c7 100755 --- a/tests/rm/many-dir-entries-vs-OOM.sh +++ b/tests/rm/many-dir-entries-vs-OOM.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm du chmod expensive_ diff --git a/tests/rm/no-give-up.sh b/tests/rm/no-give-up.sh index 0deb262a4..760a67652 100755 --- a/tests/rm/no-give-up.sh +++ b/tests/rm/no-give-up.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm require_root_ diff --git a/tests/rm/one-file-system.sh b/tests/rm/one-file-system.sh index 675c3fd0a..f4c990b60 100755 --- a/tests/rm/one-file-system.sh +++ b/tests/rm/one-file-system.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm require_root_ @@ -28,7 +28,7 @@ cleanup_() umount a/b rm -rf "$other_partition_tmpdir" } -. "$abs_srcdir/other-fs-tmpdir" +. "$abs_srcdir/tests/other-fs-tmpdir" t=$other_partition_tmpdir mkdir -p a/b $t/y diff --git a/tests/rm/one-file-system2.sh b/tests/rm/one-file-system2.sh index 077df76e6..9a56ba746 100755 --- a/tests/rm/one-file-system2.sh +++ b/tests/rm/one-file-system2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir -p a/b diff --git a/tests/rm/r-1.sh b/tests/rm/r-1.sh index 858269d75..5f0b43f49 100755 --- a/tests/rm/r-1.sh +++ b/tests/rm/r-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir a a/a || framework_failure_ diff --git a/tests/rm/r-2.sh b/tests/rm/r-2.sh index c946f63db..555accece 100755 --- a/tests/rm/r-2.sh +++ b/tests/rm/r-2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir t t/a t/a/b || framework_failure_ diff --git a/tests/rm/r-3.sh b/tests/rm/r-3.sh index 71c8a0f64..2bac15097 100755 --- a/tests/rm/r-3.sh +++ b/tests/rm/r-3.sh @@ -23,7 +23,7 @@ # And the rm from coreutils-5.0 exposes the same problem when there # are 338 or more files in a directory on a Darwin-6.5 system -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir t || framework_failure_ diff --git a/tests/rm/r-4.sh b/tests/rm/r-4.sh index 0bfb76072..735cf9f64 100755 --- a/tests/rm/r-4.sh +++ b/tests/rm/r-4.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir d || framework_failure_ diff --git a/tests/rm/read-only.sh b/tests/rm/read-only.sh index 018648be0..8e65b0c52 100755 --- a/tests/rm/read-only.sh +++ b/tests/rm/read-only.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm require_root_ diff --git a/tests/rm/readdir-bug.sh b/tests/rm/readdir-bug.sh index 711e1bc0e..1e3a96e16 100755 --- a/tests/rm/readdir-bug.sh +++ b/tests/rm/readdir-bug.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm # Create a directory containing many files. diff --git a/tests/rm/rm1.sh b/tests/rm/rm1.sh index aa90c57cc..81e048ce7 100755 --- a/tests/rm/rm1.sh +++ b/tests/rm/rm1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/rm2.sh b/tests/rm/rm2.sh index 7bbdfeaba..bf3c964a8 100755 --- a/tests/rm/rm2.sh +++ b/tests/rm/rm2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/rm3.sh b/tests/rm/rm3.sh index 37ee87b22..5ffa27500 100755 --- a/tests/rm/rm3.sh +++ b/tests/rm/rm3.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/rm4.sh b/tests/rm/rm4.sh index 3e22aad9d..290f10966 100755 --- a/tests/rm/rm4.sh +++ b/tests/rm/rm4.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/rm5.sh b/tests/rm/rm5.sh index 56c6bbc26..31b11e1bd 100755 --- a/tests/rm/rm5.sh +++ b/tests/rm/rm5.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/sunos-1.sh b/tests/rm/sunos-1.sh index 584236abc..2e649a929 100755 --- a/tests/rm/sunos-1.sh +++ b/tests/rm/sunos-1.sh @@ -21,7 +21,7 @@ # actually remove files with names of entries in the current directory # but relative to '/' rather than relative to the current directory. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm rm -r '' > /dev/null 2>&1 && fail=1 diff --git a/tests/rm/unread2.sh b/tests/rm/unread2.sh index 46fc98cd8..dd472c2ba 100755 --- a/tests/rm/unread2.sh +++ b/tests/rm/unread2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/unread3.sh b/tests/rm/unread3.sh index 4b8bbc2d3..b212184ca 100755 --- a/tests/rm/unread3.sh +++ b/tests/rm/unread3.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm skip_if_root_ diff --git a/tests/rm/v-slash.sh b/tests/rm/v-slash.sh index 2fae859b2..504f4ffb8 100755 --- a/tests/rm/v-slash.sh +++ b/tests/rm/v-slash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm mkdir a || framework_failure_ diff --git a/tests/rmdir/fail-perm.sh b/tests/rmdir/fail-perm.sh index 49cfb00ab..2b4abec54 100755 --- a/tests/rmdir/fail-perm.sh +++ b/tests/rmdir/fail-perm.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rmdir mkdir d d/e d/e/f || framework_failure_ diff --git a/tests/rmdir/ignore.sh b/tests/rmdir/ignore.sh index 92463b8d8..97001bbbe 100755 --- a/tests/rmdir/ignore.sh +++ b/tests/rmdir/ignore.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rmdir cwd=$(pwd) diff --git a/tests/rmdir/t-slash.sh b/tests/rmdir/t-slash.sh index 38e9f20d7..2fd709c26 100755 --- a/tests/rmdir/t-slash.sh +++ b/tests/rmdir/t-slash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rmdir mkdir dir || framework_failure_ diff --git a/tests/sample-test b/tests/sample-test index 7d1f6e958..a67a5dd02 100644 --- a/tests/sample-test +++ b/tests/sample-test @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ FIXME # FIXME: skip_if_root_ @@ -24,7 +24,7 @@ print_ver_ FIXME # If used, these must *follow* init.sh. # FIXME: cleanup_() { rm -rf "$other_partition_tmpdir"; } -# FIXME: . "$abs_srcdir/other-fs-tmpdir" +# FIXME: . "$abs_srcdir/tests/other-fs-tmpdir" FIXME > out || fail=1 cat <<\EOF > exp || fail=1 diff --git a/tests/split/additional-suffix.sh b/tests/split/additional-suffix.sh index 8cfd3c1e6..3cb780590 100755 --- a/tests/split/additional-suffix.sh +++ b/tests/split/additional-suffix.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split printf '1\n2\n3\n4\n5\n' > in || framework_failure_ diff --git a/tests/split/b-chunk.sh b/tests/split/b-chunk.sh index dd8b6cbdd..b83d3c838 100755 --- a/tests/split/b-chunk.sh +++ b/tests/split/b-chunk.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split # N can be greater than the file size diff --git a/tests/split/fail.sh b/tests/split/fail.sh index 83251e9e1..d77c039b0 100755 --- a/tests/split/fail.sh +++ b/tests/split/fail.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split getlimits_ diff --git a/tests/split/filter.sh b/tests/split/filter.sh index 7a55818e7..21ce5bca7 100755 --- a/tests/split/filter.sh +++ b/tests/split/filter.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split xz --version || skip_ "xz (better than gzip/bzip2) required" diff --git a/tests/split/guard-input.sh b/tests/split/guard-input.sh index 7a6fba3f5..e0f7ff5f9 100755 --- a/tests/split/guard-input.sh +++ b/tests/split/guard-input.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split seq 10 | tee exp-1 > xaa diff --git a/tests/split/l-chunk.sh b/tests/split/l-chunk.sh index 8199883a4..732b5951e 100755 --- a/tests/split/l-chunk.sh +++ b/tests/split/l-chunk.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split # invalid number of chunks diff --git a/tests/split/lines.sh b/tests/split/lines.sh index 35eb3eb2a..501b99f28 100755 --- a/tests/split/lines.sh +++ b/tests/split/lines.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split printf '1\n2\n3\n4\n5\n' > in || framework_failure_ diff --git a/tests/split/numeric.sh b/tests/split/numeric.sh index ad22df621..e1e50a143 100755 --- a/tests/split/numeric.sh +++ b/tests/split/numeric.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split # Check default start from 0 diff --git a/tests/split/r-chunk.sh b/tests/split/r-chunk.sh index afd9bf4be..cd0c52512 100755 --- a/tests/split/r-chunk.sh +++ b/tests/split/r-chunk.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split require_ulimit_ diff --git a/tests/split/suffix-auto-length.sh b/tests/split/suffix-auto-length.sh index dacc95158..4fa9fc437 100755 --- a/tests/split/suffix-auto-length.sh +++ b/tests/split/suffix-auto-length.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split diff --git a/tests/split/suffix-length.sh b/tests/split/suffix-length.sh index bc65e9f6d..58e8cfd0a 100755 --- a/tests/split/suffix-length.sh +++ b/tests/split/suffix-length.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ split a_z='a b c d e f g h i j k l m n o p q r s t u v w x y z' diff --git a/tests/tail-2/F-vs-missing.sh b/tests/tail-2/F-vs-missing.sh index fbdb53314..e09908114 100755 --- a/tests/tail-2/F-vs-missing.sh +++ b/tests/tail-2/F-vs-missing.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail debug='---disable-inotify' diff --git a/tests/tail-2/F-vs-rename.sh b/tests/tail-2/F-vs-rename.sh index 53bc00dd3..a4305b148 100755 --- a/tests/tail-2/F-vs-rename.sh +++ b/tests/tail-2/F-vs-rename.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail touch a b || framework_failure_ diff --git a/tests/tail-2/append-only.sh b/tests/tail-2/append-only.sh index c79bb7b28..be1f49dbc 100755 --- a/tests/tail-2/append-only.sh +++ b/tests/tail-2/append-only.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail require_root_ diff --git a/tests/tail-2/assert-2.sh b/tests/tail-2/assert-2.sh index d94d3d8e2..020f53d96 100755 --- a/tests/tail-2/assert-2.sh +++ b/tests/tail-2/assert-2.sh @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail # Not "expensive" per se, but sleeping for so long is annoying. diff --git a/tests/tail-2/assert.sh b/tests/tail-2/assert.sh index 043e25937..84b0a6e58 100755 --- a/tests/tail-2/assert.sh +++ b/tests/tail-2/assert.sh @@ -23,7 +23,7 @@ # Aborted # due to a race condition in which a dev/inode pair is reused. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail # Not "expensive" per se, but sleeping for so long is annoying. diff --git a/tests/tail-2/big-4gb.sh b/tests/tail-2/big-4gb.sh index 8ace3183b..93e5e93cc 100755 --- a/tests/tail-2/big-4gb.sh +++ b/tests/tail-2/big-4gb.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail expensive_ diff --git a/tests/tail-2/flush-initial.sh b/tests/tail-2/flush-initial.sh index bf68ce764..c675770a2 100755 --- a/tests/tail-2/flush-initial.sh +++ b/tests/tail-2/flush-initial.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail echo line > in || fail=1 diff --git a/tests/tail-2/follow-name.sh b/tests/tail-2/follow-name.sh index 2ab1c0119..d847505f6 100755 --- a/tests/tail-2/follow-name.sh +++ b/tests/tail-2/follow-name.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail cat <<\EOF > exp || framework_failure_ diff --git a/tests/tail-2/follow-stdin.sh b/tests/tail-2/follow-stdin.sh index ee0d1ae82..3f822c684 100755 --- a/tests/tail-2/follow-stdin.sh +++ b/tests/tail-2/follow-stdin.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail echo line > exp || framework_failure_ diff --git a/tests/tail-2/infloop-1.sh b/tests/tail-2/infloop-1.sh index 3f45f7741..ced9ed10b 100755 --- a/tests/tail-2/infloop-1.sh +++ b/tests/tail-2/infloop-1.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail yes > t & diff --git a/tests/tail-2/inotify-hash-abuse.sh b/tests/tail-2/inotify-hash-abuse.sh index deec76d1b..3cb6f6b89 100755 --- a/tests/tail-2/inotify-hash-abuse.sh +++ b/tests/tail-2/inotify-hash-abuse.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail # 9 is a magic number, related to internal details of tail.c and hash.c diff --git a/tests/tail-2/inotify-hash-abuse2.sh b/tests/tail-2/inotify-hash-abuse2.sh index eb192a656..2d01f1496 100755 --- a/tests/tail-2/inotify-hash-abuse2.sh +++ b/tests/tail-2/inotify-hash-abuse2.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail touch f || framework_failure_ diff --git a/tests/tail-2/inotify-race.sh b/tests/tail-2/inotify-race.sh index ab25f67d0..7476283cb 100755 --- a/tests/tail-2/inotify-race.sh +++ b/tests/tail-2/inotify-race.sh @@ -20,7 +20,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail # Don't run this test by default because sometimes it's skipped as noted below. diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail-2/inotify-rotate.sh index 311633a84..9a56acd51 100755 --- a/tests/tail-2/inotify-rotate.sh +++ b/tests/tail-2/inotify-rotate.sh @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then tail --version fi -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src expensive_ # Wait several seconds for grep REGEXP FILE to succeed. diff --git a/tests/tail-2/pid.sh b/tests/tail-2/pid.sh index 0a26f8d3d..1870193e5 100755 --- a/tests/tail-2/pid.sh +++ b/tests/tail-2/pid.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail getlimits_ diff --git a/tests/tail-2/pipe-f.sh b/tests/tail-2/pipe-f.sh index e3d8a70b5..60ae62e95 100755 --- a/tests/tail-2/pipe-f.sh +++ b/tests/tail-2/pipe-f.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail echo foo | timeout 10 tail -f -c3 > out || fail=1 diff --git a/tests/tail-2/pipe-f2.sh b/tests/tail-2/pipe-f2.sh index fffd43a1a..dc23c34ff 100755 --- a/tests/tail-2/pipe-f2.sh +++ b/tests/tail-2/pipe-f2.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail mkfifo_or_skip_ fifo diff --git a/tests/tail-2/proc-ksyms.sh b/tests/tail-2/proc-ksyms.sh index ad446d350..a2d4d553d 100755 --- a/tests/tail-2/proc-ksyms.sh +++ b/tests/tail-2/proc-ksyms.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail diff --git a/tests/tail-2/start-middle.sh b/tests/tail-2/start-middle.sh index 5b40de45c..431dc6c08 100755 --- a/tests/tail-2/start-middle.sh +++ b/tests/tail-2/start-middle.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail (echo 1; echo 2) > k || framework_failure_ diff --git a/tests/tail-2/tail-n0f.sh b/tests/tail-2/tail-n0f.sh index 2b2147a7f..857d5d8a2 100755 --- a/tests/tail-2/tail-n0f.sh +++ b/tests/tail-2/tail-n0f.sh @@ -21,7 +21,7 @@ # It skips the test if your system lacks a /proc/$pid/status # file, or if its contents don't look right. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail require_proc_pid_status_ diff --git a/tests/tail-2/wait.sh b/tests/tail-2/wait.sh index 587b44954..a5eefa34b 100755 --- a/tests/tail-2/wait.sh +++ b/tests/tail-2/wait.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail touch here || framework_failure_ diff --git a/tests/touch/60-seconds.sh b/tests/touch/60-seconds.sh index 915a1d05d..4f1a818af 100755 --- a/tests/touch/60-seconds.sh +++ b/tests/touch/60-seconds.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch echo 60.000000000 > exp || framework_failure_ diff --git a/tests/touch/dangling-symlink.sh b/tests/touch/dangling-symlink.sh index 1eb2ed38a..8e9235b1b 100755 --- a/tests/touch/dangling-symlink.sh +++ b/tests/touch/dangling-symlink.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch rm -f touch-target t-symlink diff --git a/tests/touch/dir-1.sh b/tests/touch/dir-1.sh index b4c04fe41..cb0e17275 100755 --- a/tests/touch/dir-1.sh +++ b/tests/touch/dir-1.sh @@ -2,7 +2,7 @@ # Make sure touch can operate on a directory. # This was broken in the 4.0[efg] test releases. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch touch . || fail=1 diff --git a/tests/touch/empty-file.sh b/tests/touch/empty-file.sh index a150bd58e..3ab0ee105 100755 --- a/tests/touch/empty-file.sh +++ b/tests/touch/empty-file.sh @@ -21,7 +21,7 @@ # fails to work on SunOS 4.1.3 with 'most of the recommended patches' when # the empty file is on an NFS-mounted 4.2 volume. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch DEFAULT_SLEEP_SECONDS=2 diff --git a/tests/touch/fail-diag.sh b/tests/touch/fail-diag.sh index b74d2a5bb..d56dbf32c 100755 --- a/tests/touch/fail-diag.sh +++ b/tests/touch/fail-diag.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch skip_if_root_ diff --git a/tests/touch/fifo.sh b/tests/touch/fifo.sh index 65f4328cc..06a8bc489 100755 --- a/tests/touch/fifo.sh +++ b/tests/touch/fifo.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch mkfifo_or_skip_ fifo diff --git a/tests/touch/no-create-missing.sh b/tests/touch/no-create-missing.sh index 88a079a01..202a92aaf 100755 --- a/tests/touch/no-create-missing.sh +++ b/tests/touch/no-create-missing.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch diff --git a/tests/touch/no-dereference.sh b/tests/touch/no-dereference.sh index aee9a5cfc..6df02a605 100755 --- a/tests/touch/no-dereference.sh +++ b/tests/touch/no-dereference.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch ln -s nowhere dangling || framework_failure_ diff --git a/tests/touch/no-rights.sh b/tests/touch/no-rights.sh index abebc5261..66631a901 100755 --- a/tests/touch/no-rights.sh +++ b/tests/touch/no-rights.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch # Make sure t2 is newer than t1. diff --git a/tests/touch/not-owner.sh b/tests/touch/not-owner.sh index 63b8af249..4d3a61bb6 100755 --- a/tests/touch/not-owner.sh +++ b/tests/touch/not-owner.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch if env -- test -w /; then diff --git a/tests/touch/now-owned-by-other.sh b/tests/touch/now-owned-by-other.sh index 3da8d35ff..3c01fbfa8 100755 --- a/tests/touch/now-owned-by-other.sh +++ b/tests/touch/now-owned-by-other.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch require_root_ diff --git a/tests/touch/obsolescent.sh b/tests/touch/obsolescent.sh index d403127be..925191395 100755 --- a/tests/touch/obsolescent.sh +++ b/tests/touch/obsolescent.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch _POSIX2_VERSION=199209; export _POSIX2_VERSION diff --git a/tests/touch/read-only.sh b/tests/touch/read-only.sh index ee8c1d3b0..d99d5a417 100755 --- a/tests/touch/read-only.sh +++ b/tests/touch/read-only.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch skip_if_root_ diff --git a/tests/touch/relative.sh b/tests/touch/relative.sh index ba199fce0..2d9d357a3 100755 --- a/tests/touch/relative.sh +++ b/tests/touch/relative.sh @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure_ diff --git a/tests/touch/trailing-slash.sh b/tests/touch/trailing-slash.sh index f09695c07..f8e6b7894 100755 --- a/tests/touch/trailing-slash.sh +++ b/tests/touch/trailing-slash.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. "${srcdir=.}/init.sh"; path_prepend_ ../src +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ touch ln -s nowhere dangling || framework_failure_ |