On Mon, Oct 27, 2014 at 10:37:39AM -0400, Conrad Meyer wrote: > Sponsored by: EMC / Isilon storage division > > Signed-off-by: Conrad Meyer <conrad.me...@isilon.com> > --- > .../bhyvexml2argv-bhyveload-explicitargs.args | 3 +++ > .../bhyvexml2argv-bhyveload-explicitargs.ldargs | 1 + > .../bhyvexml2argv-bhyveload-explicitargs.xml | 23 +++++++++++++++++++++ > .../bhyvexml2argv-custom-loader.args | 3 +++ > .../bhyvexml2argv-custom-loader.ldargs | 1 + > .../bhyvexml2argv-custom-loader.xml | 24 > ++++++++++++++++++++++ > .../bhyvexml2argv-disk-cdrom-grub.args | 3 +++ > .../bhyvexml2argv-disk-cdrom-grub.ldargs | 2 ++ > .../bhyvexml2argv-disk-cdrom-grub.xml | 23 +++++++++++++++++++++ > .../bhyvexml2argv-grub-defaults.args | 3 +++ > .../bhyvexml2argv-grub-defaults.ldargs | 2 ++ > .../bhyvexml2argv-grub-defaults.xml | 23 +++++++++++++++++++++ > tests/bhyvexml2argvtest.c | 4 ++++ > 13 files changed, 115 insertions(+) > create mode 100644 > tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args > create mode 100644 > tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs > create mode 100644 > tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args > create mode 100644 > tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs > create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs > b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs > new file mode 100644 > index 0000000..d9161ba > --- /dev/null > +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs > @@ -0,0 +1,2 @@ > +/usr/local/sbin/grub-bhyve --root cd --device-map '<device.map>' --memory > 214 \ > +bhyve Ah ha, I thought my command about device.map would become relevant :-) We probably want a 3rd expected data file '.devmap' containing the expected device map contents to compare against. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list