On Fri, Jul 02, 2010 at 11:18:25AM -0400, Chris Lalancette wrote:
Thanks to DV for knocking together the Relax-NG changes
quickly for me.
Changes since v1:
- Change the domain.rng to correspond to the new schema
- Don't allocate caps->ns in testQemuCapsInit since it is a static table
Changes since v2:
- Change domain.rng to add restrictions on allowed environment names
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
docs/schemas/domain.rng | 28 ++++++++++++++++++
src/qemu/qemu_driver.c | 16 +++++-----
src/qemu/qemu_driver.h | 15 ++++++++++
tests/qemuargv2xmltest.c | 5 +++
.../qemuxml2argv-qemu-ns-no-env.args | 1 +
.../qemuxml2argv-qemu-ns-no-env.xml | 28 ++++++++++++++++++
tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml | 30 ++++++++++++++++++++
tests/qemuxml2argvtest.c | 2 +
tests/testutilsqemu.c | 6 ++++
10 files changed, 124 insertions(+), 8 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index bd81018..501bc75 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -228,6 +228,11 @@ mymain(int argc, char **argv)
DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC,
"exec:cat");
DO_TEST_FULL("migrate", QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP,
"tcp:10.0.0.1:5000");
+ /* it's not really possible to handle the environment variables in a
+ * generic way, so we run the qemu namespace test without them
+ */
+ DO_TEST("qemu-ns-no-env", 0);
+
Not sure I really understand this comment ?
Daniel
--
|: Red Hat, Engineering, London -o-
http://people.redhat.com/berrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org -o-
http://deltacloud.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|