From caa79406aa3d9aac512ad5a32968398cb1c2dde0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 4 Nov 2009 18:41:22 -0500 Subject: tests: fix POSIX shell source style The source command does not search $PWD, and bash recently fixed itself to follow this behavior for /bin/sh. Signed-off-by: Mike Frysinger --- testsuite/all_sourcecode.tests | 2 +- testsuite/awk.tests | 2 +- testsuite/busybox.tests | 2 +- testsuite/comm.tests | 2 +- testsuite/cpio.tests | 2 +- testsuite/cut.tests | 2 +- testsuite/diff.tests | 2 +- testsuite/expand.tests | 2 +- testsuite/fold.tests | 2 +- testsuite/grep.tests | 2 +- testsuite/makedevs.tests | 2 +- testsuite/mdev.tests | 2 +- testsuite/mkfs.minix.tests | 2 +- testsuite/mount.tests | 2 +- testsuite/od.tests | 2 +- testsuite/parse.tests | 2 +- testsuite/patch.tests | 2 +- testsuite/pidof.tests | 2 +- testsuite/printf.tests | 2 +- testsuite/readlink.tests | 2 +- testsuite/rx.tests | 2 +- testsuite/sed.tests | 2 +- testsuite/seq.tests | 2 +- testsuite/sort.tests | 4 ++-- testsuite/start-stop-daemon.tests | 2 +- testsuite/sum.tests | 2 +- testsuite/tail.tests | 2 +- testsuite/taskset.tests | 2 +- testsuite/test.tests | 2 +- testsuite/tr.tests | 2 +- testsuite/unexpand.tests | 2 +- testsuite/uniq.tests | 2 +- testsuite/unzip.tests | 2 +- testsuite/uuencode.tests | 2 +- testsuite/xargs.tests | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/testsuite/all_sourcecode.tests b/testsuite/all_sourcecode.tests index 5b3f0388d..c0a1f863f 100755 --- a/testsuite/all_sourcecode.tests +++ b/testsuite/all_sourcecode.tests @@ -5,7 +5,7 @@ # Licensed under GPL v2, see file LICENSE for details. [ -n "$srcdir" ] || srcdir=$(pwd) -. testing.sh +. ./testing.sh # diff --git a/testsuite/awk.tests b/testsuite/awk.tests index 0db99ab21..2c7642ce0 100755 --- a/testsuite/awk.tests +++ b/testsuite/awk.tests @@ -3,7 +3,7 @@ # Copyright 2007 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "description" "command" "result" "infile" "stdin" diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests index 26536c656..7c44b1ed6 100755 --- a/testsuite/busybox.tests +++ b/testsuite/busybox.tests @@ -4,7 +4,7 @@ # Copyright 2005 by Rob Landley # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh HELPDUMP=`busybox` diff --git a/testsuite/comm.tests b/testsuite/comm.tests index 44169f9b7..753db217c 100755 --- a/testsuite/comm.tests +++ b/testsuite/comm.tests @@ -3,7 +3,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "description" "command" "result" "infile" "stdin" diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests index fa0b65a08..f21ba18d1 100755 --- a/testsuite/cpio.tests +++ b/testsuite/cpio.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # ls -ln shows date. Need to remove that, it's variable. # sed: coalesce spaces diff --git a/testsuite/cut.tests b/testsuite/cut.tests index 2788d1fbe..0fd79f2df 100755 --- a/testsuite/cut.tests +++ b/testsuite/cut.tests @@ -3,7 +3,7 @@ # Copyright 2007 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/diff.tests b/testsuite/diff.tests index ac68a0890..bf24b7752 100755 --- a/testsuite/diff.tests +++ b/testsuite/diff.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/expand.tests b/testsuite/expand.tests index 3f4cda3f8..57498a201 100755 --- a/testsuite/expand.tests +++ b/testsuite/expand.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/fold.tests b/testsuite/fold.tests index 5e1f34552..ca0e511c1 100755 --- a/testsuite/fold.tests +++ b/testsuite/fold.tests @@ -2,7 +2,7 @@ # Copyright 2009 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/grep.tests b/testsuite/grep.tests index 7e3dff0d6..6e14f91ce 100755 --- a/testsuite/grep.tests +++ b/testsuite/grep.tests @@ -5,7 +5,7 @@ # AUDIT: -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/makedevs.tests b/testsuite/makedevs.tests index 9e068bdca..b41614f13 100755 --- a/testsuite/makedevs.tests +++ b/testsuite/makedevs.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # ls -ln is showing date. Need to remove that, it's variable # sed: (1) "maj, min" -> "maj,min" (2) coalesce spaces diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests index d52f3b10b..319c670da 100755 --- a/testsuite/mdev.tests +++ b/testsuite/mdev.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # ls -ln is showing date. Need to remove that, it's variable # sed: (1) "maj, min" -> "maj,min" (2) coalesce spaces diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests index 90df9316d..7cad7daa6 100755 --- a/testsuite/mkfs.minix.tests +++ b/testsuite/mkfs.minix.tests @@ -4,7 +4,7 @@ # Copyright 2007 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/mount.tests b/testsuite/mount.tests index f4a2cc214..8bd60ea0c 100755 --- a/testsuite/mount.tests +++ b/testsuite/mount.tests @@ -2,7 +2,7 @@ # Copyright 2007 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh test "`id -u`" = 0 || { echo "SKIPPED: must be root to test this" diff --git a/testsuite/od.tests b/testsuite/od.tests index f136bb5fa..0bf1f4c54 100755 --- a/testsuite/od.tests +++ b/testsuite/od.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/parse.tests b/testsuite/parse.tests index f1ee7b830..999efef1c 100755 --- a/testsuite/parse.tests +++ b/testsuite/parse.tests @@ -3,7 +3,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh COLLAPSE=$(( 0x00010000)) TRIM=$(( 0x00020000)) diff --git a/testsuite/patch.tests b/testsuite/patch.tests index 1bdc0c24a..f3e607186 100755 --- a/testsuite/patch.tests +++ b/testsuite/patch.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/pidof.tests b/testsuite/pidof.tests index a05a30239..45df1a958 100755 --- a/testsuite/pidof.tests +++ b/testsuite/pidof.tests @@ -6,7 +6,7 @@ # AUDIT: -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/printf.tests b/testsuite/printf.tests index 0a63f0f57..95f8110ad 100755 --- a/testsuite/printf.tests +++ b/testsuite/printf.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # Need this in order to not execute shell builtin bb="busybox " diff --git a/testsuite/readlink.tests b/testsuite/readlink.tests index 0faa6ed0c..e6822dff1 100755 --- a/testsuite/readlink.tests +++ b/testsuite/readlink.tests @@ -4,7 +4,7 @@ # Copyright 2006 by Natanael Copa # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh TESTDIR=readlink_testdir TESTFILE="$TESTDIR/testfile" diff --git a/testsuite/rx.tests b/testsuite/rx.tests index 417f04b57..c2b8814a2 100755 --- a/testsuite/rx.tests +++ b/testsuite/rx.tests @@ -2,7 +2,7 @@ # Copyright 2009 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/sed.tests b/testsuite/sed.tests index 696d980ef..875c946be 100755 --- a/testsuite/sed.tests +++ b/testsuite/sed.tests @@ -4,7 +4,7 @@ # Copyright 2005 by Rob Landley # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "description" "arguments" "result" "infile" "stdin" diff --git a/testsuite/seq.tests b/testsuite/seq.tests index 817e1a724..7a5537427 100755 --- a/testsuite/seq.tests +++ b/testsuite/seq.tests @@ -6,7 +6,7 @@ # AUDIT: Full SUSv3 coverage (except internationalization). -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/sort.tests b/testsuite/sort.tests index 627ca51f8..5ed29fb12 100755 --- a/testsuite/sort.tests +++ b/testsuite/sort.tests @@ -1,10 +1,10 @@ -#!/bin/bash +#!/bin/sh # SUSv3 compliant sort tests. # Copyright 2005 by Rob Landley # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # The basic tests. These should work even with the small busybox. diff --git a/testsuite/start-stop-daemon.tests b/testsuite/start-stop-daemon.tests index ba77cde6e..76b0be08c 100755 --- a/testsuite/start-stop-daemon.tests +++ b/testsuite/start-stop-daemon.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "cmd" "expected result" "file input" "stdin" diff --git a/testsuite/sum.tests b/testsuite/sum.tests index e537cf607..da278c787 100755 --- a/testsuite/sum.tests +++ b/testsuite/sum.tests @@ -6,7 +6,7 @@ # AUDIT: Unit tests for sum -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/tail.tests b/testsuite/tail.tests index d97bf7bbe..d2427d430 100755 --- a/testsuite/tail.tests +++ b/testsuite/tail.tests @@ -3,7 +3,7 @@ # Copyright 2009 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "command" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/taskset.tests b/testsuite/taskset.tests index 53d7f10da..1a19285d7 100755 --- a/testsuite/taskset.tests +++ b/testsuite/taskset.tests @@ -2,7 +2,7 @@ # Copyright 2006 Bernhard Reutner-Fischer # Licensed under GPL v2 or later, see file LICENSE for details. -. testing.sh +. ./testing.sh a="taskset" # testing "test name" "opts" "expected result" "file inp" "stdin" diff --git a/testsuite/test.tests b/testsuite/test.tests index b7c84d9b2..7d8044467 100755 --- a/testsuite/test.tests +++ b/testsuite/test.tests @@ -3,7 +3,7 @@ # Copyright 2007 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "command" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/tr.tests b/testsuite/tr.tests index f91cc1f65..9706056c9 100755 --- a/testsuite/tr.tests +++ b/testsuite/tr.tests @@ -3,7 +3,7 @@ # Copyright 2009 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "description" "arguments" "result" "infile" "stdin" diff --git a/testsuite/unexpand.tests b/testsuite/unexpand.tests index e7f42c5fd..5c82a1e50 100755 --- a/testsuite/unexpand.tests +++ b/testsuite/unexpand.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" diff --git a/testsuite/uniq.tests b/testsuite/uniq.tests index 94c45592f..02c595a0e 100755 --- a/testsuite/uniq.tests +++ b/testsuite/uniq.tests @@ -6,7 +6,7 @@ # AUDIT: Full SUSv3 coverage (except internationalization). -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests index 975079db6..0ce5da26c 100755 --- a/testsuite/unzip.tests +++ b/testsuite/unzip.tests @@ -5,7 +5,7 @@ # Copyright 2006 Glenn McGrath # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/uuencode.tests b/testsuite/uuencode.tests index cb658db3b..6556e60d1 100755 --- a/testsuite/uuencode.tests +++ b/testsuite/uuencode.tests @@ -6,7 +6,7 @@ # AUDIT: Unit tests for uuencode -. testing.sh +. ./testing.sh # testing "test name" "options" "expected result" "file input" "stdin" # file input will be file called "input" diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests index 36524499e..17f4e7a1b 100755 --- a/testsuite/xargs.tests +++ b/testsuite/xargs.tests @@ -2,7 +2,7 @@ # Copyright 2008 by Denys Vlasenko # Licensed under GPL v2, see file LICENSE for details. -. testing.sh +. ./testing.sh # testing "test name" "command" "expected result" "file input" "stdin" -- cgit v1.2.3