I'm applying these fixes to avoid "make check" failures:

From f41517a4250db0961482e097813eb39da5bea963 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering@redhat.com> Date: Mon, 9 Feb 2009 16:25:36 +0100 Subject: [PATCH] avoid two test failures induced by today's error-reporting changes

* tests/cpuset: Adjust expected diagnostic to match new behavior. * tests/undefine: Likewise. --- tests/cpuset | 4 ++-- tests/undefine | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cpuset b/tests/cpuset index 75303e3..eeb0ee2 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -1,7 +1,7 @@ #!/bin/sh # ensure that defining with an invalid vCPU cpuset elicits a diagnostic -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008-2009 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,8 +36,8 @@ sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 # Require failure and a diagnostic. virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 cat <<\EOF > exp || fail=1 -libvir: Domain Config error : failed Xen syscall topology cpuset syntax error error: Failed to define domain from xml-invalid +error: failed Xen syscall topology cpuset syntax error EOF compare exp out || fail=1 diff --git a/tests/undefine b/tests/undefine index 48e8356..fafdae7 100755 --- a/tests/undefine +++ b/tests/undefine @@ -1,7 +1,7 @@ #!/bin/sh # exercise virsh's "undefine" command -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008-2009 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,8 +29,8 @@ fail=0 virsh -q -c test:///default undefine test > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 -libvir: Test error : internal error Domain 'test' is still running error: Failed to undefine domain test +error: internal error Domain 'test' is still running EOF compare exp out || fail=1 -- 1.6.2.rc0.173.g5e148