tests: cfg2cmd: add a few q35 related tests

[qemu-server.git] / test / run_config2command_tests.pl

diff --git a/test/run_config2command_tests.pl b/test/run_config2command_tests.pl
index 7a4c0eb2423eb637857aaf9bcc88dcccaf914500..04df9d93e3e22dae228a69336e5d9c1ab26bf4b4 100755 (executable)
--- a/test/run_config2command_tests.pl
+++ b/test/run_config2command_tests.pl
@@ -30,6 +30,13 @@ my $base_env = {
                type => 'dir',
                shared => 0,
            },
+           'btrfs-store' => {
+               content => {
+                   images => 1,
+               },
+               path => '/butter/bread',
+               type => 'btrfs',
+           },
            'cifs-store' => {
                shared => 1,
                path => '/mnt/pve/cifs-store',
@@ -84,6 +91,8 @@ my $current_test; # = {
 #   description => 'Test description', # if available
 #   qemu_version => '2.12',
 #   host_arch => 'HOST_ARCH',
+#   expected_error => 'error message',
+#   expected_warning => 'warning message',
 #   config => { config hash },
 #   expected => [ expected outcome cmd line array ],
 # };
@@ -92,6 +101,7 @@ my $current_test; # = {
 #   TEST: A single line describing the test, gets outputted
 #   QEMU_VERSION: \d+\.\d+(\.\d+)? (defaults to current version)
 #   HOST_ARCH: x86_64 | aarch64 (default to x86_64, to make tests stable)
+#   EXPECT_ERROR: <error message> For negative tests
 # all fields are optional
 sub parse_test($) {
     my ($config_fn) = @_;
@@ -120,6 +130,8 @@ sub parse_test($) {
            $current_test->{host_arch} = "$1";
        } elsif ($line =~ /^EXPECT_ERROR:\s*(.*)\s*$/) {
            $current_test->{expect_error} = "$1";
+       } elsif ($line =~ /^EXPECT_WARN(?:ING)?:\s*(.*)\s*$/) {
+           $current_test->{expect_warning} = "$1";
        }
     }
 
@@ -283,7 +295,7 @@ sub diff($$) {
     my $ha = IO::Handle->new_from_fd($wa, 'w');
     my $hb = IO::Handle->new_from_fd($wb, 'w');
 
-    open my $diffproc, '-|', 'diff', '-up', "/proc/self/fd/$ra", "/proc/self/fd/$rb"
+    open my $diffproc, '-|', 'diff', '-up', "/proc/self/fd/$ra", "/proc/self/fd/$rb" ## no critic
        or die "failed to run program 'diff': $!";
     POSIX::close($ra);
     POSIX::close($rb);
@@ -306,6 +318,23 @@ sub 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;
+       }
+    }
+
+    fail($current_test->{testname});
+    note("got unexpected warning '$warning'");
+};
+
 sub do_test($) {
     my ($config_fn) = @_;
 
@@ -379,7 +408,7 @@ print "testing config to command stabillity\n";
 if (my $file = shift) {
     do_test $file;
 } else {
-    foreach my $file (<cfg2cmd/*.conf>) {
+    while (my $file = <cfg2cmd/*.conf>) {
        do_test $file;
     }
 }