summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest-lorry2
-rwxr-xr-xtests/bzr-single-commit.script2
-rwxr-xr-xtests/cvs-single-commit.script2
-rwxr-xr-xtests/git-backup-on-error.script4
-rwxr-xr-xtests/git-single-commit.script2
-rwxr-xr-xtests/hg-single-commit.script2
-rwxr-xr-xtests/make-tarball.script2
-rwxr-xr-xtests/no-pushspec-pushall.script2
-rwxr-xr-xtests/pushspecs-only.script2
-rwxr-xr-xtests/svn-single-commit.script2
-rwxr-xr-xtests/tar-single-commit.script2
11 files changed, 12 insertions, 12 deletions
diff --git a/test-lorry b/test-lorry
index c693507..67f051d 100755
--- a/test-lorry
+++ b/test-lorry
@@ -1,3 +1,3 @@
#!/bin/sh
-exec ${SRCDIR}/lorry --no-default-configs --tarball=never "$@"
+exec "${SRCDIR}/lorry" --no-default-configs --tarball=never "$@"
diff --git a/tests/bzr-single-commit.script b/tests/bzr-single-commit.script
index 51fdb6d..9b38552 100755
--- a/tests/bzr-single-commit.script
+++ b/tests/bzr-single-commit.script
@@ -24,7 +24,7 @@ set -e
logfile="$DATADIR/bzr-test-repo.log"
workdir="$DATADIR/work-dir"
-${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
"$DATADIR/bzr-test-repo.lorry" > /dev/null 2> /dev/null
# verify that the git repository was set up correctly
diff --git a/tests/cvs-single-commit.script b/tests/cvs-single-commit.script
index e133fae..4ce2587 100755
--- a/tests/cvs-single-commit.script
+++ b/tests/cvs-single-commit.script
@@ -28,7 +28,7 @@ export USER=root
export LOGNAME=$USER
export USERNAME=$USER
-${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
"$DATADIR/cvs-test-repo.lorry" > /dev/null 2> /dev/null
# verify that the git repository was created successfully
diff --git a/tests/git-backup-on-error.script b/tests/git-backup-on-error.script
index 8be1a83..fbb3368 100755
--- a/tests/git-backup-on-error.script
+++ b/tests/git-backup-on-error.script
@@ -35,12 +35,12 @@ normalize() {
}
# mirror some history
-${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" --bundle=never \
+"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" --bundle=never \
"$DATADIR/git-backup-test-repo.lorry" | normalize
# make upstream disappear to cause errors
rm -rf "$repo"
-if ${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" \
+if "${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
"$DATADIR/git-backup-test-repo.lorry" --bundle=never 2>/dev/null | \
normalize
then
diff --git a/tests/git-single-commit.script b/tests/git-single-commit.script
index b3d8e43..7a980b2 100755
--- a/tests/git-single-commit.script
+++ b/tests/git-single-commit.script
@@ -24,7 +24,7 @@ set -e
logfile="$DATADIR/git-test-repo.log"
workdir="$DATADIR/work-dir"
-${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
"$DATADIR/git-test-repo.lorry" > /dev/null 2> /dev/null
# verify that the git repository was set up correctly
diff --git a/tests/hg-single-commit.script b/tests/hg-single-commit.script
index 585fd33..05343fb 100755
--- a/tests/hg-single-commit.script
+++ b/tests/hg-single-commit.script
@@ -24,7 +24,7 @@ set -e
logfile="$DATADIR/hg-test-repo.log"
workdir="$DATADIR/work-dir"
-${SRCDIR}/test-lorry --verbose --pull-only --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --verbose --pull-only --log="$logfile" --working-area="$workdir" \
"$DATADIR/hg-test-repo.lorry" > /dev/null 2> /dev/null
# verify that the git repository was created correctly
diff --git a/tests/make-tarball.script b/tests/make-tarball.script
index 8be7b77..95eacaa 100755
--- a/tests/make-tarball.script
+++ b/tests/make-tarball.script
@@ -23,7 +23,7 @@ set -e
logfile="$DATADIR/make-tarball.log"
workdir="$DATADIR/work-dir"
-${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
--tarball=first \
"$DATADIR/make-tarball-repo.lorry" > /dev/null 2> /dev/null
diff --git a/tests/no-pushspec-pushall.script b/tests/no-pushspec-pushall.script
index 7de3a58..a649122 100755
--- a/tests/no-pushspec-pushall.script
+++ b/tests/no-pushspec-pushall.script
@@ -37,7 +37,7 @@ mirror_path="$DATADIR"/git-mirror
mkdir -p "$mirror_path"
git init --quiet --bare "$mirror_path"/no-pushspec.git
-${SRCDIR}/test-lorry --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --log="$logfile" --working-area="$workdir" \
--mirror-base-url-push=file://"$mirror_path" \
--mirror-base-url-fetch=file://"$mirror_path" \
"$lorryfile"
diff --git a/tests/pushspecs-only.script b/tests/pushspecs-only.script
index d7f4c2f..80aa8de 100755
--- a/tests/pushspecs-only.script
+++ b/tests/pushspecs-only.script
@@ -41,7 +41,7 @@ mirror_path="$DATADIR"/git-mirror
mkdir -p "$mirror_path"
git init --quiet --bare "$mirror_path"/pushspecs.git
-${SRCDIR}/test-lorry --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --log="$logfile" --working-area="$workdir" \
--mirror-base-url-push=file://"$mirror_path" \
--mirror-base-url-fetch=file://"$mirror_path" \
"$lorryfile"
diff --git a/tests/svn-single-commit.script b/tests/svn-single-commit.script
index cff91b0..32a9cca 100755
--- a/tests/svn-single-commit.script
+++ b/tests/svn-single-commit.script
@@ -23,7 +23,7 @@ set -e
logfile="$DATADIR/svn-test-repo.log"
workdir="$DATADIR/work-dir"
-${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
"$DATADIR/svn-test-repo.lorry" > /dev/null 2> /dev/null
# verify that the git repository was created successfully
diff --git a/tests/tar-single-commit.script b/tests/tar-single-commit.script
index f1d92c5..1562446 100755
--- a/tests/tar-single-commit.script
+++ b/tests/tar-single-commit.script
@@ -23,7 +23,7 @@ set -e
logfile="$DATADIR/tar-single-commit.log"
workdir="$DATADIR/work-dir"
-${SRCDIR}/test-lorry --pull-only --log="$logfile" --working-area="$workdir" \
+"${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
"$DATADIR/tar-test-repo.lorry" > /dev/null 2> /dev/null
# verify that the git repositories were created successfully