From 1f3e96480213ba2b2d809593cd1448e2f99e4595 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 2 May 2008 23:44:59 +0200 Subject: tests: hoist the sourcing of "lang-default" * tests/check.mk (TESTS_ENVIRONMENT): Source lang-default here, ... ... rather than in each of 100+ test scripts. * tests/chgrp/basic: * tests/chgrp/no-x: * tests/chmod/c-option: * tests/chmod/no-x: * tests/chmod/setgid: * tests/chmod/thru-dangling: * tests/chmod/umask-x: * tests/chmod/usage: * tests/chown/basic: * tests/chown/deref: * tests/chown/preserve-root: * tests/cp/abuse: * tests/cp/acl: * tests/cp/backup-is-src: * tests/cp/cp-a-selinux: * tests/cp/cp-i: * tests/cp/cp-mv-backup: * tests/cp/deref-slink: * tests/cp/fail-perm: * tests/cp/into-self: * tests/cp/link-preserve: * tests/cp/preserve-gid: * tests/cp/same-file: * tests/cp/slink-2-slink: * tests/cp/special-f: * tests/cp/symlink-slash: * tests/cp/thru-dangling: * tests/du/basic: * tests/du/hard-link: * tests/du/inacc-dest: * tests/du/long-sloop: * tests/du/no-x: * tests/install/basic-1: * tests/ln/hard-backup: * tests/ln/sf-1: * tests/ls/file-type: * tests/ls/infloop: * tests/ls/nameless-uid: * tests/ls/rt-1: * tests/ls/stat-failed: * tests/ls/symlink-slash: * tests/ls/x-option: * tests/misc/chcon: * tests/misc/chcon-fail: * tests/misc/csplit: * tests/misc/df-P: * tests/misc/groups-dash: * tests/misc/groups-version: * tests/misc/nohup: * tests/misc/printf-surprise: * tests/misc/runcon-no-reorder: * tests/misc/selinux: * tests/misc/split-a: * tests/misc/split-fail: * tests/misc/tac-continue: * tests/misc/wc-files0: * tests/mkdir/p-v: * tests/mkdir/selinux: * tests/mv/acl: * tests/mv/backup-dir: * tests/mv/backup-is-src: * tests/mv/childproof: * tests/mv/diag: * tests/mv/dir2dir: * tests/mv/dup-source: * tests/mv/force: * tests/mv/hard-link-1: * tests/mv/hard-verbose: * tests/mv/i-2: * tests/mv/i-3: * tests/mv/i-4: * tests/mv/i-5: * tests/mv/i-link-no: * tests/mv/into-self: * tests/mv/into-self-2: * tests/mv/into-self-3: * tests/mv/mv-special-1: * tests/mv/part-fail: * tests/mv/part-symlink: * tests/mv/partition-perm: * tests/mv/perm-1: * tests/mv/reply-no: * tests/mv/sticky-to-xpart: * tests/mv/update: * tests/rm/cycle: * tests/rm/dir-no-w: * tests/rm/dir-nonrecur: * tests/rm/fail-2eperm: * tests/rm/fail-eacces: * tests/rm/inaccessible: * tests/rm/interactive-always: * tests/rm/interactive-once: * tests/rm/isatty: * tests/rm/one-file-system: * tests/rm/r-1: * tests/rm/r-2: * tests/rm/rm1: * tests/rm/rm2: * tests/rm/rm3: * tests/rm/rm4: * tests/rm/rm5: * tests/rm/unread2: * tests/rm/v-slash: * tests/touch/fail-diag: * tests/touch/not-owner: --- tests/mv/acl | 1 - tests/mv/backup-dir | 1 - tests/mv/backup-is-src | 1 - tests/mv/childproof | 1 - tests/mv/diag | 1 - tests/mv/dir2dir | 1 - tests/mv/dup-source | 1 - tests/mv/force | 1 - tests/mv/hard-link-1 | 1 - tests/mv/hard-verbose | 1 - tests/mv/i-2 | 1 - tests/mv/i-3 | 1 - tests/mv/i-4 | 1 - tests/mv/i-5 | 1 - tests/mv/i-link-no | 1 - tests/mv/into-self | 1 - tests/mv/into-self-2 | 1 - tests/mv/into-self-3 | 1 - tests/mv/mv-special-1 | 1 - tests/mv/part-fail | 1 - tests/mv/part-symlink | 1 - tests/mv/partition-perm | 1 - tests/mv/perm-1 | 1 - tests/mv/reply-no | 1 - tests/mv/sticky-to-xpart | 1 - tests/mv/update | 1 - 26 files changed, 26 deletions(-) (limited to 'tests/mv') diff --git a/tests/mv/acl b/tests/mv/acl index 095fef12d..858c2aff9 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then setfacl --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_acl_ diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir index d23476e34..e3b42fbbb 100755 --- a/tests/mv/backup-dir +++ b/tests/mv/backup-dir @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir A B || framework_failure diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src index f90ce43c6..3335d0758 100755 --- a/tests/mv/backup-is-src +++ b/tests/mv/backup-is-src @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/childproof b/tests/mv/childproof index 6cece3f3c..1fa77dc01 100755 --- a/tests/mv/childproof +++ b/tests/mv/childproof @@ -25,7 +25,6 @@ if test "$VERBOSE" = yes; then ln --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/diag b/tests/mv/diag index 37739f071..413da6fa6 100755 --- a/tests/mv/diag +++ b/tests/mv/diag @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then fi # Make sure we get English translations. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch f1 || framework_failure diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir index f8361fbff..76622dc0a 100755 --- a/tests/mv/dir2dir +++ b/tests/mv/dir2dir @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir -p a/t b/t || framework_failure diff --git a/tests/mv/dup-source b/tests/mv/dup-source index bba2ef869..edb539733 100755 --- a/tests/mv/dup-source +++ b/tests/mv/dup-source @@ -25,7 +25,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/force b/tests/mv/force index 27c0a18b4..05d7f0446 100755 --- a/tests/mv/force +++ b/tests/mv/force @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh ff=mvforce diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1 index 93f8ec194..6afaeade6 100755 --- a/tests/mv/hard-link-1 +++ b/tests/mv/hard-link-1 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose index f156f79f7..3a2456633 100755 --- a/tests/mv/hard-verbose +++ b/tests/mv/hard-verbose @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch x || framework_failure diff --git a/tests/mv/i-2 b/tests/mv/i-2 index 2b537309c..4153dc98f 100755 --- a/tests/mv/i-2 +++ b/tests/mv/i-2 @@ -25,7 +25,6 @@ fi # Make sure we get English translations. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/i-3 b/tests/mv/i-3 index 1250baf7d..3052526e9 100755 --- a/tests/mv/i-3 +++ b/tests/mv/i-3 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/input-tty . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/i-4 b/tests/mv/i-4 index 371452759..e1a2c1cae 100755 --- a/tests/mv/i-4 +++ b/tests/mv/i-4 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh for i in a b; do diff --git a/tests/mv/i-5 b/tests/mv/i-5 index 4143c838e..3b2e27d15 100755 --- a/tests/mv/i-5 +++ b/tests/mv/i-5 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir a || framework_failure diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no index b3f8fd4be..2eddf8513 100755 --- a/tests/mv/i-link-no +++ b/tests/mv/i-link-no @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir a b || framework_failure diff --git a/tests/mv/into-self b/tests/mv/into-self index a877de4f5..e9273d16a 100755 --- a/tests/mv/into-self +++ b/tests/mv/into-self @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh dir=toself-dir diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2 index 147941a22..32801a3a4 100755 --- a/tests/mv/into-self-2 +++ b/tests/mv/into-self-2 @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3 index f531f5188..3235b7f95 100755 --- a/tests/mv/into-self-3 +++ b/tests/mv/into-self-3 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh dir1=is3-dir1 diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1 index 8bf507577..d883f5b12 100755 --- a/tests/mv/mv-special-1 +++ b/tests/mv/mv-special-1 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/part-fail b/tests/mv/part-fail index 92d7ad4af..e5396c2c6 100755 --- a/tests/mv/part-fail +++ b/tests/mv/part-fail @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; } diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink index f49ebec02..0b7e21347 100755 --- a/tests/mv/part-symlink +++ b/tests/mv/part-symlink @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm index 54aa8363a..ca32e473f 100755 --- a/tests/mv/partition-perm +++ b/tests/mv/partition-perm @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/perm-1 b/tests/mv/perm-1 index a5ab790c0..8a359ff71 100755 --- a/tests/mv/perm-1 +++ b/tests/mv/perm-1 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/reply-no b/tests/mv/reply-no index 35ec5241c..e3947724f 100755 --- a/tests/mv/reply-no +++ b/tests/mv/reply-no @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch a b || framework_failure diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart index 940770b63..d0e90c1ac 100755 --- a/tests/mv/sticky-to-xpart +++ b/tests/mv/sticky-to-xpart @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ diff --git a/tests/mv/update b/tests/mv/update index 6fab2ce03..7edb99a75 100755 --- a/tests/mv/update +++ b/tests/mv/update @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh echo old > old || framework_failure -- cgit v1.2.3-70-g09d2