Dne 27.3.2013 20:58, Cole Robinson napsal(a):
On 03/27/2013 03:35 PM, Lukáš Doktor wrote:
Dne 25.3.2013 17:37, Cole Robinson napsal(a):
This allows the basic unittest config to be shared between
./run --type qemu --test unittest and
./run --config qemu/cfg/unittests.cfg
While the latter may be the preferred invocation, I don't see any
reason to arbitrarily restrict things, especially when 'unittest'
shows up the --list-tests output.
Signed-off-by: Cole Robinson <[email protected]>
---
v2: Rebase, remove config bits from qemu/cfg/unittests.cfg, fix a
comment there.
qemu/cfg/unittests.cfg | 17 ++++-------------
qemu/tests/cfg/unittest.cfg | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 13 deletions(-)
create mode 100644 qemu/tests/cfg/unittest.cfg
diff --git a/qemu/cfg/unittests.cfg b/qemu/cfg/unittests.cfg
index 0b7e08e..2a2962f 100644
--- a/qemu/cfg/unittests.cfg
+++ b/qemu/cfg/unittests.cfg
@@ -71,19 +71,10 @@ variants:
installers = git_repo_qemu_kvm git_repo_kvm_unit_tests
- unittest:
+ # Options here can be tweaked in qemu/tests/cfg/unittest.cfg,
+ # such as whitelist/blacklisting what tests are run.
Hi Cole,
This will work only for ./run --type qemu --test unittest
By running ./run --config qemu/cfg/unittests.cfg you never touch the
qemu/tests/cfg/unittest.cfg file. You have to keep the settings on booth places.
simple reproducer cartesian_config.py qemu/cfg/unittests.cfg -c
[before]
dict 1: unittest
dep = []
display = vnc
isa_debugexit = yes
isa_debugexit_iobase = 0xf4
isa_debugexit_iosize = 0x04
isa_serials = serial1
kill_vm = yes
kill_vm_gracefully = no
main_monitor = humanmonitor1
main_vm = unittest_vm
mem = 512
monitor_type = human
monitors = humanmonitor1
name = unittest
qemu_binary = qemu
qemu_img_binary = qemu-img
run_kvm_stat = yes
run_tcpdump = no
shortname = unittest
start_vm = no
take_regular_screendumps = no
testdev = yes
type = unittest
unittest_timeout = 240
used_cpus = 1
used_mem = 512
vm_type = qemu
vms =
[after]
dict 1: unittest
dep = []
display = vnc
isa_serials = serial1
kill_vm = yes
kill_vm_gracefully = no
main_monitor = humanmonitor1
main_vm = unittest_vm
mem = 512
monitor_type = human
monitors = humanmonitor1
name = unittest
qemu_binary = qemu
qemu_img_binary = qemu-img
run_kvm_stat = yes
run_tcpdump = no
shortname = unittest
start_vm = yes
take_regular_screendumps = no
type = unittest
used_cpus = 1
used_mem = 512
vm_type = qemu
vms = unittest_vm
So NACK, this have to be fixed in order to keep the old ways working...
Hmm, sorry about that. I did try and test it but my testing must have been
screwed up, because it doesn't work for me now either.
Does the cartesian config format provide a way for us to share the config? It
would be nice to avoid the duplication.
Thanks,
Cole
You could add "include ../tests/cfg/unittest.cfg" before the "only
unittest" line of the "cfg/unittests.cfg" file. This way unittest params
will be overridden by the ones from ../tests/cfg/unittest.cfg while the
"build" should stay unaffected.
_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel
