Ok Lukas, this was applied to next and master. When you have further split patches, you can base them on top of current master.
Thanks! On Thu, May 17, 2012 at 3:32 AM, Feng Yang <[email protected]> wrote: > On 05/17/2012 02:18 PM, Lukáš Doktor wrote: >> Dne 17.5.2012 04:39, Feng Yang napsal(a): >>> On 05/16/2012 08:50 PM, Lukáš Doktor wrote: >>>> Splits virtio_console test into smaller logical bundles of test >>>> variants. >>>> >>>> Added variants: >>>> * smoke (should always work) >>>> * basic (should always work) >>>> * performance (needed only for perf regression testing) >>>> * destructive (those are tricky) >>>> * migration (migration-related tests) >>>> * hotplug (hotplug-related tests) >>>> >>>> Signed-off-by: Lukáš Doktor<[email protected]> >>> Hi, Lukáš >>> >>> Thanks for your patch! >>> >>> Could you rewrite virtio console script and put vm create related >>> code, maybe some other code also, to framework. Then we can reuse >>> them in other >>> virtio console/serial related scripts. We still have other virtio >>> console/serial case did not covered in this script. >>> >>> for hotplug part, hope it can be configured to hotplug/ unhotplug >>> one/multi serial for many times. >>> Thanks. >>> >> Hi Feng, >> >> it's on my TODO list just after some virtio_scsi tests... >> >> Anyway about the hotplug. I can split it into hotplug_basic and >> hotplug_stress. Currently it does a lots of things: >> 1) it adds ports >> 2) tries to delete them while they are used >> 3) the same with heavy load >> 4) adds max number of ports >> 5) removes some and adds back >> 6) adds 1 port 100 times (so this is basically what you want to run, >> right?) > yes. And also need hotplug/ unhotplug multi serial for many times. > Hope port numbers and hotplug times is configurable. Just like what we > do in pci hotplug in internal tree. >> >> Please let me know whether you want them in separate, or whether they >> can come together. > Thanks for your work. > I think put hotplug related in a separate script is better. It is easy > for co-work with other scripts. > > We have virtio serial hotpulg and migration, then its easy to have > migration after virtio serial hotplug. Now in internal tree we have > function to call sub-case in one script. > > Thanks again. > > Feng > >> >> Cheers, >> Lukáš >> >>> >>> >>>> --- >>>> client/virt/subtests.cfg.sample | 67 >>>> +++++++++++++++++++++++++++++--------- >>>> 1 files changed, 51 insertions(+), 16 deletions(-) >>>> >>>> diff --git a/client/virt/subtests.cfg.sample >>>> b/client/virt/subtests.cfg.sample >>>> index f080a3a..b705432 100644 >>>> --- a/client/virt/subtests.cfg.sample >>>> +++ b/client/virt/subtests.cfg.sample >>>> @@ -1769,36 +1769,71 @@ variants: >>>> virtio_console_no_serialports = 0 >>>> virtio_console_no_consoles = 0 >>>> >>>> + # BASIC INFO ABOUT VIRTIO_CONSOLE PARAMS >>>> # smoke params - $console_type:data_string >>>> # FIXME: test_smoke doesn't work with console yet >>>> (virtio_console bug) >>>> # "serialport;console:Custom data" >>>> - smoke_test = yes >>>> - virtio_console_smoke = "serialport" >>>> + #smoke_test = yes >>>> + #virtio_console_smoke = "serialport" >>>> # loopback params - >>>> '$source_console_type@buffer_length:$destination_console_type1@buffer_length:...:$loopback_buffer_length;...' >>>> - loopback_test = yes >>>> - virtio_console_loopback = >>>> "serialport:serialport;serialport@1024:serialport@32:console@1024:console@8:16" >>>> + #loopback_test = yes >>>> + #virtio_console_loopback = >>>> "serialport:serialport;serialport@1024:serialport@32:console@1024:console@8:16" >>>> # perf params - $console_type@buffer_length:$test_duration >>>> # FIXME: test_perf doesn't work with console yet >>>> (virtio_console bug) >>>> # virtio_console_perf = >>>> "serialport;serialport@1000000:120;console@1024:60" >>>> - perf_test = yes >>>> - virtio_console_perf = "serialport;serialport@1000000:120" >>>> + #perf_test = yes >>>> + #virtio_console_perf = "serialport;serialport@1000000:120" >>>> # Enable destructive tests: "test_name = yes" >>>> # Disable test: change yes or delete key. >>>> - rmmod_test = yes >>>> - max_ports_test = yes >>>> - shutdown_test = yes >>>> + #rmmod_test = yes >>>> + #max_ports_test = yes >>>> + #shutdown_test = yes >>>> >>>> # Offline migration params - >>>> '$console_type:$no_migrations:$send-:$recv-$loopback-buffer_length' >>>> - migrate_offline_test = yes >>>> - virtio_console_migration_offline = >>>> "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096" >>>> + #migrate_offline_test = yes >>>> + #virtio_console_migration_offline = >>>> "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096" >>>> >>>> # Online migration params - >>>> '$console_type:$no_migrations:$send-:$recv-$loopback-buffer_length' >>>> - migrate_online_test = yes >>>> - virtio_console_migration_online = >>>> "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096" >>>> + #migrate_online_test = yes >>>> + #virtio_console_migration_online = >>>> "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096" >>>> >>>> - hotplug_test = yes >>>> - hotplug_serial_test = yes >>>> - hotplug_console_test = no >>>> + #hotplug_test = yes >>>> + #hotplug_serial_test = yes >>>> + #hotplug_console_test = no >>>> + >>>> + # CASES SETUPS: >>>> + variants: >>>> + - smoke: >>>> + # Very basic test of presence of virtio_console in >>>> system >>>> + variants: >>>> + - serialport: >>>> + smoke_test = yes >>>> + virtio_console_smoke = "serialport" >>>> + - console: >>>> + # FIXME: test_smoke doesn't work with >>>> console due of virtio_console bug, disable this variant >>>> + no virtio_console >>>> + smoke_test = yes >>>> + virtio_console_smoke = "console" >>>> + - basic: >>>> + # Basic virtio_console functionality tests >>>> + loopback_test = yes >>>> + virtio_console_loopback = >>>> "serialport:serialport;serialport@1024:serialport@32:console@1024:console@8:16" >>>> + - performance: >>>> + perf_test = yes >>>> + virtio_console_perf = >>>> "serialport;serialport@1000000:120" >>>> + - destructive: >>>> + rmmod_test = yes >>>> + max_ports_test = yes >>>> + shutdown_test = yes >>>> + - migration: >>>> + migrate_offline_test = yes >>>> + virtio_console_migration_offline = >>>> "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096" >>>> + migrate_online_test = yes >>>> + virtio_console_migration_online = >>>> "serialport:1:2048:2048:2048;serialport:5:4096:4096:4096" >>>> + - hotplug: >>>> + hotplug_test = yes >>>> + hotplug_serial_test = yes >>>> + hotplug_console_test = no >>>> >>>> # This unit test module is for older branches of KVM that use the >>>> # kvmctl test harness (such as the code shipped with RHEL 5.x) >>> >> > > _______________________________________________ > Autotest mailing list > [email protected] > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest -- Lucas _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
