diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2012-03-08 19:27:37 +0000 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2012-03-08 19:27:37 +0000 |
commit | 99702fe443383707b9d9c1b84570baf3bebf9253 (patch) | |
tree | 19f39103b94d1b217a1e976395c6522855200d42 | |
parent | f8e7a41e678c3bd7ede50a38b1da7f3a5f92ddea (diff) | |
download | libguestfs-99702fe443383707b9d9c1b84570baf3bebf9253.tar.gz libguestfs-99702fe443383707b9d9c1b84570baf3bebf9253.tar.xz libguestfs-99702fe443383707b9d9c1b84570baf3bebf9253.zip |
extra-tests: Export LIBVIRT_DEFAULT_URI to pick-guests.pl.
This fixes commit 2912e4e1173226f461517a0008664e01b5d3066d.
-rw-r--r-- | tests/extra/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/extra/Makefile.am b/tests/extra/Makefile.am index dfdffd18..b807048b 100644 --- a/tests/extra/Makefile.am +++ b/tests/extra/Makefile.am @@ -64,8 +64,13 @@ export LIBVIRT_DEFAULT_URI = \ qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock-ro # Choose guests at random on each run. +# +# 'export LIBVIRT_DEFAULT_URI' above doesn't appear to have an effect +# for $(shell ...) commands, so we have to redefine LIBVIRT_DEFAULT_URI here. random_guests := \ - $(shell $(abs_top_builddir)/run $(srcdir)/pick-guests.pl 5) + $(shell \ + LIBVIRT_DEFAULT_URI='qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock-ro' \ + $(abs_top_builddir)/run $(srcdir)/pick-guests.pl 5) extra-tests: \ test-guests \ |