From 9962ae934b367294a57b27d58f7cdb4e2d54ce04 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Oct 2010 15:22:48 +0200 Subject: [PATCH] tests/integration/test-*: remove a bunch of "local" that are used outside funtions (bash complains) --- test/integration/run-tests | 2 +- test/integration/test-autoremove | 2 +- .../test-bug-590438-broken-provides-thanks-to-remove-order | 2 +- test/integration/test-bug-591882-conkeror | 2 +- test/integration/test-bug-595691-empty-and-broken-archive-files | 2 +- .../integration/test-bug-598669-install-postfix-gets-exim-heavy | 2 +- test/integration/test-compressed-indexes | 2 +- test/integration/test-disappearing-packages | 2 +- test/integration/test-pdiff-usage | 2 +- test/integration/test-policy-pinning | 2 +- test/integration/test-ubuntu-bug-614993 | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/integration/run-tests b/test/integration/run-tests index cb74f21e7..c7ea0a61a 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -1,7 +1,7 @@ #!/bin/sh set -e -local DIR=$(readlink -f $(dirname $0)) +DIR=$(readlink -f $(dirname $0)) for testcase in $(run-parts --list $DIR | grep '/test-'); do echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m" ${testcase} diff --git a/test/integration/test-autoremove b/test/integration/test-autoremove index 7127b3d82..1ca325b29 100755 --- a/test/integration/test-autoremove +++ b/test/integration/test-autoremove @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment configarchitecture 'i386' diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order index 9fd7741f4..3be0bec48 100755 --- a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order +++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror index 27a217b5f..e1c0b42d1 100755 --- a/test/integration/test-bug-591882-conkeror +++ b/test/integration/test-bug-591882-conkeror @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment configarchitecture "i386" diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files index d982a4981..2f127221a 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment configarchitecture "i386" diff --git a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy index 3fee63bbb..c3a77f346 100755 --- a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy +++ b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment configarchitecture "i386" diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes index 0b73f4c35..97a1453f7 100755 --- a/test/integration/test-compressed-indexes +++ b/test/integration/test-compressed-indexes @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages index ebf2bb14f..12d215d7a 100755 --- a/test/integration/test-disappearing-packages +++ b/test/integration/test-disappearing-packages @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment configarchitecture "i386" diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 85cbe9082..a70b6122c 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning index 97447b330..fa356ed54 100755 --- a/test/integration/test-policy-pinning +++ b/test/integration/test-policy-pinning @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment diff --git a/test/integration/test-ubuntu-bug-614993 b/test/integration/test-ubuntu-bug-614993 index d70c65ba2..49955f231 100755 --- a/test/integration/test-ubuntu-bug-614993 +++ b/test/integration/test-ubuntu-bug-614993 @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment configarchitecture "amd64" -- 2.45.2