From: Eric Blake Date: Wed, 12 Sep 2012 17:25:51 +0000 (-0600) Subject: build: avoid confusing make with raw name 'undefine' X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a20f06d9d9b0353d7fb7a8e11a631253d5961b96;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git build: avoid confusing make with raw name 'undefine' Make has a builtin operator 'undefine', and coupled with latest automake.git, this test name ended up confusing make into thinking the file name was meant to be used as the make operator. Renaming the file avoids the confusion. * tests/undefine: Rename... * tests/virsh-undefine: ...to this. * tests/Makefile.am (test_scripts): Use new name. Reported by Jim Meyering. --- diff --git a/tests/Makefile.am b/tests/Makefile.am index bec89e20e..c5cecaa38 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -182,12 +182,13 @@ test_scripts += \ read-bufsiz \ read-non-seekable \ start \ - undefine \ vcpupin \ virsh-all \ virsh-optparse \ virsh-schedinfo \ - virsh-synopsis + virsh-synopsis \ + virsh-undefine \ + $(NULL) test_programs += \ eventtest \ @@ -203,12 +204,13 @@ EXTRA_DIST += \ read-bufsiz \ read-non-seekable \ start \ - undefine \ vcpupin \ virsh-all \ virsh-optparse \ virsh-schedinfo \ - virsh-synopsis + virsh-synopsis \ + virsh-undefine \ + $(NULL) endif if WITH_SECDRIVER_APPARMOR diff --git a/tests/undefine b/tests/undefine deleted file mode 100755 index f7ba49593..000000000 --- a/tests/undefine +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# exercise virsh's "undefine" command - -# Copyright (C) 2008-2009, 2011 Red Hat, 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 -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHEXP ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# . - -test -z "$srcdir" && srcdir=$(pwd) -test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/.. -test -z "$abs_top_builddir" && abs_top_builddir=$(pwd)/.. - -if test "$VERBOSE" = yes; then - set -x - $abs_top_builddir/tools/virsh --version -fi - -. "$srcdir/test-lib.sh" - -fail=0 - -# Attempt to undefine a running domain, by domain name. Every time a new -# connection is opened to the test driver, it starts life with a new -# persistent running domain named 'test' with a different uuid, so -# testing this command requires batch mode use of virsh. -$abs_top_builddir/tools/virsh -q -c test:///default \ - 'dominfo test; undefine test; dominfo test' > out1 2>&1 -test $? = 0 || fail=1 -sed '/^Persistent/n; /:/d' < out1 > out -cat <<\EOF > exp || fail=1 -Persistent: yes -Domain test has been undefined -Persistent: no -EOF -compare exp out || fail=1 - -# A similar diagnostic when specifying a domain ID -$abs_top_builddir/tools/virsh -q -c test:///default \ - 'dominfo 1; undefine 1; dominfo 1' > out1 2>&1 -test $? = 0 || fail=1 -sed '/^Persistent/n; /:/d' < out1 > out -cat <<\EOF > exp || fail=1 -Persistent: yes -Domain 1 has been undefined -Persistent: no -EOF -compare exp out || fail=1 - -# Succeed, now: first shut down, then undefine, both via name. -$abs_top_builddir/tools/virsh -q -c test:///default \ - 'shutdown test; undefine test; dominfo test' > out 2>&1 -test $? = 1 || fail=1 -cat <<\EOF > expout || fail=1 -Domain test is being shutdown -Domain test has been undefined -error: failed to get domain 'test' -error: Domain not found -EOF -compare expout out || fail=1 - -(exit $fail); exit $fail diff --git a/tests/virsh-undefine b/tests/virsh-undefine new file mode 100755 index 000000000..f7ba49593 --- /dev/null +++ b/tests/virsh-undefine @@ -0,0 +1,72 @@ +#!/bin/sh +# exercise virsh's "undefine" command + +# Copyright (C) 2008-2009, 2011 Red Hat, 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 +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHEXP ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see +# . + +test -z "$srcdir" && srcdir=$(pwd) +test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/.. +test -z "$abs_top_builddir" && abs_top_builddir=$(pwd)/.. + +if test "$VERBOSE" = yes; then + set -x + $abs_top_builddir/tools/virsh --version +fi + +. "$srcdir/test-lib.sh" + +fail=0 + +# Attempt to undefine a running domain, by domain name. Every time a new +# connection is opened to the test driver, it starts life with a new +# persistent running domain named 'test' with a different uuid, so +# testing this command requires batch mode use of virsh. +$abs_top_builddir/tools/virsh -q -c test:///default \ + 'dominfo test; undefine test; dominfo test' > out1 2>&1 +test $? = 0 || fail=1 +sed '/^Persistent/n; /:/d' < out1 > out +cat <<\EOF > exp || fail=1 +Persistent: yes +Domain test has been undefined +Persistent: no +EOF +compare exp out || fail=1 + +# A similar diagnostic when specifying a domain ID +$abs_top_builddir/tools/virsh -q -c test:///default \ + 'dominfo 1; undefine 1; dominfo 1' > out1 2>&1 +test $? = 0 || fail=1 +sed '/^Persistent/n; /:/d' < out1 > out +cat <<\EOF > exp || fail=1 +Persistent: yes +Domain 1 has been undefined +Persistent: no +EOF +compare exp out || fail=1 + +# Succeed, now: first shut down, then undefine, both via name. +$abs_top_builddir/tools/virsh -q -c test:///default \ + 'shutdown test; undefine test; dominfo test' > out 2>&1 +test $? = 1 || fail=1 +cat <<\EOF > expout || fail=1 +Domain test is being shutdown +Domain test has been undefined +error: failed to get domain 'test' +error: Domain not found +EOF +compare expout out || fail=1 + +(exit $fail); exit $fail