mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
466f902446
Prior to commit85d2810, we had an issue where: snapshot-create-as dom name --diskspec spec --diskspec spec failed to parse the second spec, because the first spec had marked that option as no longer requiring an argument. In commit85d2810, I fixed it by making argv options no longer mark the option as seen. But this in turn breaks mandatory argv options, which now complain that the argv option is missing. This patch reverts that part of85d2810, and instead replaces it with fixes to no longer clear opts_need_arg of an argv argument. * tools/virsh.c (vshCmddefGetOption, vshCmddefGetData) (vshCommandParse): Fix option parsing for required argv option. (vshCmddefOptParse): Check that argv option is last. * tests/virsh-optparse: Enhance test.
139 lines
3.7 KiB
Bash
Executable File
139 lines
3.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# Ensure that virsh option parsing doesn't regress
|
|
|
|
# Copyright (C) 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 WITHOUT 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 <http://www.gnu.org/licenses/>.
|
|
|
|
: ${srcdir=$(pwd)}
|
|
: ${abs_top_srcdir=$(pwd)/..}
|
|
: ${abs_top_builddir=$(pwd)/..}
|
|
|
|
# If $abs_top_builddir/tools is not early in $PATH, put it there,
|
|
# so that we can safely invoke "virsh" simply with its name.
|
|
case $PATH in
|
|
$abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;;
|
|
$abs_top_builddir/tools:*) ;;
|
|
*) PATH=$abs_top_builddir/tools:$PATH; export PATH ;;
|
|
esac
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
virsh --version
|
|
fi
|
|
|
|
. "$srcdir/test-lib.sh"
|
|
|
|
cat <<\EOF > exp-out || framework_failure
|
|
|
|
setvcpus: <domain> trying as domain NAME
|
|
setvcpus: count(optdata): 2
|
|
setvcpus: domain(optdata): test
|
|
setvcpus: found option <domain>: test
|
|
EOF
|
|
|
|
fail=0
|
|
|
|
test_url=test:///default
|
|
|
|
for args in \
|
|
'test 2' \
|
|
'--domain test 2' \
|
|
'--domain=test 2' \
|
|
'test --count 2' \
|
|
'test --count=2' \
|
|
'--domain test --count 2' \
|
|
'--domain=test --count 2' \
|
|
'--domain test --count=2' \
|
|
'--domain=test --count=2' \
|
|
'--count 2 --domain test' \
|
|
'--count 2 --domain=test' \
|
|
'--count=2 --domain test' \
|
|
'--count=2 --domain=test' \
|
|
'--count 2 test' \
|
|
'--count=2 test' \
|
|
; do
|
|
virsh -d0 -c $test_url setvcpus $args >out 2>>err || fail=1
|
|
LC_ALL=C sort out | compare - exp-out || fail=1
|
|
done
|
|
|
|
# Another complex parsing example
|
|
cat <<\EOF > exp-out || framework_failure
|
|
<domainsnapshot>
|
|
<description>1<2</description>
|
|
<disks>
|
|
<disk name='vda' snapshot='external'>
|
|
<source file='a&b,c'/>
|
|
</disk>
|
|
<disk name='vdb'/>
|
|
</disks>
|
|
</domainsnapshot>
|
|
|
|
EOF
|
|
virsh -q -c $test_url snapshot-create-as --print-xml test \
|
|
--diskspec 'vda,file=a&b,,c,snapshot=external' --description '1<2' \
|
|
--diskspec vdb >out 2>>err || fail=1
|
|
compare out exp-out || fail=1
|
|
|
|
cat <<\EOF > exp-out || framework_failure
|
|
<domainsnapshot>
|
|
<name>name</name>
|
|
<description>vda</description>
|
|
<disks>
|
|
<disk name='vdb'/>
|
|
</disks>
|
|
</domainsnapshot>
|
|
|
|
EOF
|
|
virsh -q -c $test_url snapshot-create-as --print-xml test name vda vdb \
|
|
>out 2>>err || fail=1
|
|
compare out exp-out || fail=1
|
|
|
|
cat <<\EOF > exp-out || framework_failure
|
|
<domainsnapshot>
|
|
<name>name</name>
|
|
<description>desc</description>
|
|
<disks>
|
|
<disk name='vda'/>
|
|
<disk name='vdb'/>
|
|
</disks>
|
|
</domainsnapshot>
|
|
|
|
EOF
|
|
for args in \
|
|
'test name desc vda vdb' \
|
|
'test name desc --diskspec vda vdb' \
|
|
'test name desc --diskspec vda --diskspec vdb' \
|
|
'test name desc vda vdb' \
|
|
'test --diskspec vda name --diskspec vdb desc' \
|
|
'--description desc --name name --domain test vda vdb' \
|
|
'--description desc --diskspec vda --name name --domain test vdb' \
|
|
; do
|
|
virsh -q -c $test_url snapshot-create-as --print-xml $args \
|
|
>out 2>>err || fail=1
|
|
compare out exp-out || fail=1
|
|
done
|
|
|
|
test -s err && fail=1
|
|
|
|
# Test a required argv
|
|
cat <<\EOF > exp-err || framework_failure
|
|
error: this function is not supported by the connection driver: virDomainQemuMonitorCommand
|
|
EOF
|
|
virsh -q -c $test_url qemu-monitor-command test a >out 2>err && fail=1
|
|
test -s out && fail=1
|
|
compare err exp-err || fail=1
|
|
|
|
(exit $fail); exit $fail
|