11:57 a.m.
Tests are run via the ./run binary, so all the binaries in the build
directory are available via $PATH already.
Followup of commit e85a976c5a474d751c6e8352370047a3177a7c45.
---
cat/Makefile.am | 2 +-
df/Makefile.am | 2 +-
fuse/test-fuse-umount-race.sh | 4 ++--
fuse/test-guestmount-fd.c | 4 ++--
fuse/test-guestunmount-fd.c | 2 +-
fuse/test-guestunmount-not-mounted.sh | 2 +-
inspector/Makefile.am | 2 +-
rescue/test-virt-rescue.pl | 2 +-
sysprep/Makefile.am | 6 +++---
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cat/Makefile.am b/cat/Makefile.am
index e2fe84d..1a3482b 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -214,5 +214,5 @@ check-valgrind:
check-valgrind-local-guests:
for g in $(GUESTS); do \
- $(top_builddir)/run --test @VG@ ./virt-filesystems -c "$(libvirt_ro_uri)" -d
"$$g" --all --long -h --uuid || exit $$?; \
+ $(top_builddir)/run --test @VG@ virt-filesystems -c "$(libvirt_ro_uri)" -d
"$$g" --all --long -h --uuid || exit $$?; \
done
diff --git a/df/Makefile.am b/df/Makefile.am
index 83879cd..2cf487d 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -107,4 +107,4 @@ check-valgrind:
$(MAKE) VG="$(top_builddir)/run @VG@" check
check-valgrind-local-guests:
- $(top_builddir)/run --test @VG@ ./virt-df -c "$(libvirt_ro_uri)"
+ $(top_builddir)/run --test @VG@ virt-df -c "$(libvirt_ro_uri)"
diff --git a/fuse/test-fuse-umount-race.sh b/fuse/test-fuse-umount-race.sh
index 3c85f17..5d582c4 100755
--- a/fuse/test-fuse-umount-race.sh
+++ b/fuse/test-fuse-umount-race.sh
@@ -57,7 +57,7 @@ guestfish -- \
backingfile:../test-data/phony-guests/fedora.img backingformat:raw
mkdir mp
-./guestmount --format=qcow2 -a test.qcow2 -m /dev/VG/Root --pid-file test.pid mp
+guestmount --format=qcow2 -a test.qcow2 -m /dev/VG/Root --pid-file test.pid mp
cp $0 mp/test-umount
# Save the PID of guestmount.
@@ -66,7 +66,7 @@ pid="$(cat test.pid)"
timeout=10
# Unmount the mountpoint.
-./guestunmount -v mp
+guestunmount -v mp
# Wait for guestmount to exit.
count=$timeout
diff --git a/fuse/test-guestmount-fd.c b/fuse/test-guestmount-fd.c
index 3889094..9f302b4 100644
--- a/fuse/test-guestmount-fd.c
+++ b/fuse/test-guestmount-fd.c
@@ -34,8 +34,8 @@
#include "guestfs.h"
#include "guestfs-internal-frontend.h"
-#define GUESTMOUNT_BINARY "./guestmount"
-#define GUESTUNMOUNT_BINARY "./guestunmount"
+#define GUESTMOUNT_BINARY "guestmount"
+#define GUESTUNMOUNT_BINARY "guestunmount"
#define TEST_IMAGE "../test-data/phony-guests/fedora.img"
#define MOUNTPOINT "test-guestmount-fd.d"
#define TEST_FILE MOUNTPOINT "/etc/fstab"
diff --git a/fuse/test-guestunmount-fd.c b/fuse/test-guestunmount-fd.c
index ad7ff74..019f821 100644
--- a/fuse/test-guestunmount-fd.c
+++ b/fuse/test-guestunmount-fd.c
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
snprintf (fd_str, sizeof fd_str, "%d", pipefd[0]);
- execlp ("./guestunmount", "guestunmount", "--fd",
fd_str, "/", NULL);
+ execlp ("guestunmount", "guestunmount", "--fd", fd_str,
"/", NULL);
perror ("execlp");
_exit (EXIT_FAILURE);
}
diff --git a/fuse/test-guestunmount-not-mounted.sh
b/fuse/test-guestunmount-not-mounted.sh
index 5e1febe..7d65dba 100755
--- a/fuse/test-guestunmount-not-mounted.sh
+++ b/fuse/test-guestunmount-not-mounted.sh
@@ -40,7 +40,7 @@ if [ ! -w /dev/fuse ]; then
fi
# Not expecting cwd to be a FUSE mountpoint.
-./guestunmount --quiet $(pwd)
+guestunmount --quiet $(pwd)
r=$?
case $r in
0)
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 127bf03..cfb39ba 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -117,5 +117,5 @@ check-valgrind:
check-valgrind-local-guests:
for g in $(GUESTS); do \
- $(top_builddir)/run --test @VG@ ./virt-inspector -c "$(libvirt_ro_uri)" -d
"$$g" || exit $$?; \
+ $(top_builddir)/run --test @VG@ virt-inspector -c "$(libvirt_ro_uri)" -d
"$$g" || exit $$?; \
done
diff --git a/rescue/test-virt-rescue.pl b/rescue/test-virt-rescue.pl
index f149e48..9eaeb4e 100755
--- a/rescue/test-virt-rescue.pl
+++ b/rescue/test-virt-rescue.pl
@@ -32,7 +32,7 @@ unless (exists $INC{"Expect.pm"}) {
}
# Run virt-rescue and make sure we get to the rescue prompt.
-my $exp = Expect->spawn ("./virt-rescue", "--scratch")
+my $exp = Expect->spawn ("virt-rescue", "--scratch")
or die "$progname: Expect could not spawn virt-rescue: $!\n";
my $timeout = 5 * 60;
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index ceb165c..7913484 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -194,12 +194,12 @@ stamp-virt-sysprep.pod: virt-sysprep.pod sysprep-extra-options.pod
sysprep-opera
sysprep-extra-options.pod: virt-sysprep
rm -f $@ $@-t
- $(top_builddir)/run ./$< --dump-pod-options > $@-t
+ $(top_builddir)/run $< --dump-pod-options > $@-t
mv $@-t $@
sysprep-operations.pod: virt-sysprep
rm -f $@ $@-t
- $(top_builddir)/run ./$< --dump-pod > $@-t
+ $(top_builddir)/run $< --dump-pod > $@-t
mv $@-t $@
# Tests.
@@ -226,7 +226,7 @@ check-valgrind:
check-valgrind-local-guests:
for g in $(GUESTS); do \
- $(top_builddir)/run --test @VG@ ./virt-sysprep -n -c "$(libvirt_ro_uri)" -d
"$$g" || exit $$?; \
+ $(top_builddir)/run --test @VG@ virt-sysprep -n -c "$(libvirt_ro_uri)" -d
"$$g" || exit $$?; \
done
# Dependencies.
--
2.5.5