diff options
-rwxr-xr-x | haskell/run-bindtests | 2 | ||||
-rwxr-xr-x | java/run-bindtests | 2 | ||||
-rwxr-xr-x | ocaml/run-bindtests | 2 | ||||
-rwxr-xr-x | perl/run-bindtests | 2 | ||||
-rwxr-xr-x | python/run-bindtests | 4 | ||||
-rwxr-xr-x | ruby/run-bindtests | 4 | ||||
-rwxr-xr-x | tests/guests/guest-aux/make-debian-img.sh | 4 | ||||
-rwxr-xr-x | tests/guests/guest-aux/make-ubuntu-img.sh | 4 | ||||
-rwxr-xr-x | tests/guests/guest-aux/make-windows-img.sh | 6 | ||||
-rwxr-xr-x | tests/md/test-mdadm.sh | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/haskell/run-bindtests b/haskell/run-bindtests index 3b174035..170b6d02 100755 --- a/haskell/run-bindtests +++ b/haskell/run-bindtests @@ -19,4 +19,4 @@ set -e ./Bindtests > bindtests.tmp -diff -u ${srcdir}/../bindtests bindtests.tmp +diff -u $srcdir/../bindtests bindtests.tmp diff --git a/java/run-bindtests b/java/run-bindtests index 4fc147a7..9557c9d0 100755 --- a/java/run-bindtests +++ b/java/run-bindtests @@ -19,4 +19,4 @@ set -e $JAVA -Djava.library.path=.libs Bindtests > bindtests.tmp -diff -u ${srcdir}/../bindtests bindtests.tmp +diff -u $srcdir/../bindtests bindtests.tmp diff --git a/ocaml/run-bindtests b/ocaml/run-bindtests index af6fc14a..da10231d 100755 --- a/ocaml/run-bindtests +++ b/ocaml/run-bindtests @@ -19,4 +19,4 @@ set -e ./bindtests > bindtests.tmp -diff -u ${srcdir}/../bindtests bindtests.tmp +diff -u $srcdir/../bindtests bindtests.tmp diff --git a/perl/run-bindtests b/perl/run-bindtests index 5a53ab63..e4621e32 100755 --- a/perl/run-bindtests +++ b/perl/run-bindtests @@ -20,4 +20,4 @@ set -e export PERL5LIB=$(pwd)/blib/lib:$(pwd)/blib/arch perl bindtests.pl > bindtests.tmp -diff -u ${srcdir}/../bindtests bindtests.tmp +diff -u $srcdir/../bindtests bindtests.tmp diff --git a/python/run-bindtests b/python/run-bindtests index 0299ff1b..1a8ba766 100755 --- a/python/run-bindtests +++ b/python/run-bindtests @@ -18,5 +18,5 @@ set -e -$PYTHON ${srcdir}/bindtests.py > bindtests.tmp -diff -u ${srcdir}/../bindtests bindtests.tmp +$PYTHON $srcdir/bindtests.py > bindtests.tmp +diff -u $srcdir/../bindtests bindtests.tmp diff --git a/ruby/run-bindtests b/ruby/run-bindtests index aafcfbae..e9fdc31d 100755 --- a/ruby/run-bindtests +++ b/ruby/run-bindtests @@ -18,5 +18,5 @@ set -e -$RUBY -I${srcdir}/lib -Iext/guestfs ${srcdir}/bindtests.rb > bindtests.tmp -diff -u ${srcdir}/../bindtests bindtests.tmp +$RUBY -I$srcdir/lib -Iext/guestfs $srcdir/bindtests.rb > bindtests.tmp +diff -u $srcdir/../bindtests bindtests.tmp diff --git a/tests/guests/guest-aux/make-debian-img.sh b/tests/guests/guest-aux/make-debian-img.sh index b936f817..9449d0f2 100755 --- a/tests/guests/guest-aux/make-debian-img.sh +++ b/tests/guests/guest-aux/make-debian-img.sh @@ -80,9 +80,9 @@ upload fstab.tmp /etc/fstab write /etc/debian_version "5.0.1" write /etc/hostname "debian.invalid" -upload ${SRCDIR}/guest-aux/debian-packages /var/lib/dpkg/status +upload $SRCDIR/guest-aux/debian-packages /var/lib/dpkg/status -upload ${SRCDIR}/../data/bin-x86_64-dynamic /bin/ls +upload $SRCDIR/../data/bin-x86_64-dynamic /bin/ls mkdir /boot/grub touch /boot/grub/grub.conf diff --git a/tests/guests/guest-aux/make-ubuntu-img.sh b/tests/guests/guest-aux/make-ubuntu-img.sh index e55c7908..c2831aaa 100755 --- a/tests/guests/guest-aux/make-ubuntu-img.sh +++ b/tests/guests/guest-aux/make-ubuntu-img.sh @@ -69,9 +69,9 @@ write /etc/debian_version "5.0.1" upload release.tmp /etc/lsb-release write /etc/hostname "ubuntu.invalid" -upload ${SRCDIR}/guest-aux/debian-packages /var/lib/dpkg/status +upload $SRCDIR/guest-aux/debian-packages /var/lib/dpkg/status -upload ${SRCDIR}/../data/bin-x86_64-dynamic /bin/ls +upload $SRCDIR/../data/bin-x86_64-dynamic /bin/ls mkdir /boot/grub touch /boot/grub/grub.conf diff --git a/tests/guests/guest-aux/make-windows-img.sh b/tests/guests/guest-aux/make-windows-img.sh index 47b8abb1..ed949981 100755 --- a/tests/guests/guest-aux/make-windows-img.sh +++ b/tests/guests/guest-aux/make-windows-img.sh @@ -58,10 +58,10 @@ mkfs ntfs /dev/sda2 mount-options "" /dev/sda2 / mkdir-p /Windows/System32/Config -upload ${SRCDIR}/guest-aux/windows-software /Windows/System32/Config/SOFTWARE -upload ${SRCDIR}/guest-aux/windows-system /Windows/System32/Config/SYSTEM +upload $SRCDIR/guest-aux/windows-software /Windows/System32/Config/SOFTWARE +upload $SRCDIR/guest-aux/windows-system /Windows/System32/Config/SYSTEM -upload ${SRCDIR}/../data/bin-win32.exe /Windows/System32/cmd.exe +upload $SRCDIR/../data/bin-win32.exe /Windows/System32/cmd.exe mkdir "/Program Files" touch /autoexec.bat diff --git a/tests/md/test-mdadm.sh b/tests/md/test-mdadm.sh index e7f5775a..620dcfd9 100755 --- a/tests/md/test-mdadm.sh +++ b/tests/md/test-mdadm.sh @@ -100,7 +100,7 @@ eval `../../fish/guestfish --listen` ../../fish/guestfish --remote run for md in `../../fish/guestfish --remote list-md-devices`; do - ../../fish/guestfish --remote md-detail "${md}" > md-detail.out + ../../fish/guestfish --remote md-detail "$md" > md-detail.out sed 's/:\s*/=/' md-detail.out > md-detail.out.sh . md-detail.out.sh @@ -158,7 +158,7 @@ eval `../../fish/guestfish --listen` ../../fish/guestfish --remote run for md in `../../fish/guestfish --remote list-md-devices`; do - ../../fish/guestfish --remote md-stop "${md}" + ../../fish/guestfish --remote md-stop "$md" done ../../fish/guestfish --remote exit |