proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 22:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: cfg2cmd: check also warnings

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-08-21 10:38:27 +02:00
parent 90d96715f8
commit 1e27bda1aa
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/cfg2cmd/custom-cpu-model-host-phys-bits.conf
View File

@ -1,4 +1,5 @@
# TEST: Check if custom CPU models are resolved correctly # TEST: Check if custom CPU models are resolved correctly
# EXPECT_WARN: warning: CPU flag/setting '-kvm_pv_unhalt' (set by custom CPU model) overwrites '+kvm_pv_unhalt' (set by PVE; to improve Linux guest spinlock performance)
cores: 3 cores: 3
cpu: custom-qemu64,phys-bits=host cpu: custom-qemu64,phys-bits=host
name: customcpu name: customcpu

1
test/cfg2cmd/custom-cpu-model.conf
View File

@ -1,4 +1,5 @@
# TEST: Check if custom CPU models are resolved correctly # TEST: Check if custom CPU models are resolved correctly
# EXPECT_WARN: warning: CPU flag/setting '-kvm_pv_unhalt' (set by custom CPU model) overwrites '+kvm_pv_unhalt' (set by PVE; to improve Linux guest spinlock performance)
cores: 3 cores: 3
cpu: custom-qemu64,flags=+virt-ssbd cpu: custom-qemu64,flags=+virt-ssbd
name: customcpu name: customcpu

23
test/run_config2command_tests.pl
View File

@ -84,6 +84,8 @@ my $current_test; # = {
# description => 'Test description', # if available # description => 'Test description', # if available
# qemu_version => '2.12', # qemu_version => '2.12',
# host_arch => 'HOST_ARCH', # host_arch => 'HOST_ARCH',
# expected_error => 'error message',
# expected_warning => 'warning message',
# config => { config hash }, # config => { config hash },
# expected => [ expected outcome cmd line array ], # expected => [ expected outcome cmd line array ],
# }; # };
@ -92,6 +94,7 @@ my $current_test; # = {
# TEST: A single line describing the test, gets outputted # TEST: A single line describing the test, gets outputted
# QEMU_VERSION: \d+\.\d+(\.\d+)? (defaults to current version) # QEMU_VERSION: \d+\.\d+(\.\d+)? (defaults to current version)
# HOST_ARCH: x86_64 | aarch64 (default to x86_64, to make tests stable) # HOST_ARCH: x86_64 | aarch64 (default to x86_64, to make tests stable)
# EXPECT_ERROR: <error message> For negative tests
# all fields are optional # all fields are optional
sub parse_test($) { sub parse_test($) {
my ($config_fn) = @_; my ($config_fn) = @_;
@ -120,6 +123,8 @@ sub parse_test($) {
$current_test->{host_arch} = "$1"; $current_test->{host_arch} = "$1";
} elsif ($line =~ /^EXPECT_ERROR:\s*(.*)\s*$/) { } elsif ($line =~ /^EXPECT_ERROR:\s*(.*)\s*$/) {
$current_test->{expect_error} = "$1"; $current_test->{expect_error} = "$1";
} elsif ($line =~ /^EXPECT_WARN(?:ING)?:\s*(.*)\s*$/) {
$current_test->{expect_warning} = "$1";
} }
} }
@ -306,6 +311,24 @@ sub diff($$) {
die "files differ:\n$diff"; die "files differ:\n$diff";
} }
$SIG{__WARN__} = sub {
my $warning = shift;
chomp $warning;
if (my $warn_expect = $current_test->{expect_warning}) {
if ($warn_expect ne $warning) {
fail($current_test->{testname});
note("warning does not match expected error: '$warning' != '$warn_expect'");
} else {
note("got expected warning '$warning'");
return;
}
}
#warn "======= WARN ======\n= ". $_[0] . "===================\n";
fail($current_test->{testname});
note("got unexpected expected warning '$warning'");
};
sub do_test($) { sub do_test($) {
my ($config_fn) = @_; my ($config_fn) = @_;