]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
rumprun: xenstorels: New regexps for finding output
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 1 Jul 2016 18:16:41 +0000 (19:16 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 5 Sep 2016 14:03:20 +0000 (15:03 +0100)
The framing output in rumprun upstream has changed.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
ts-rumprun-demo-xenstorels

index a40110a29af77752f4f111947d2aa1d87aaa7759..831c58afbd85447317769b1732632c0afdbed5e3 100755 (executable)
@@ -77,10 +77,11 @@ END
 sub their_xenstorels () {
     some_xenstorels('theirs', sub {
        $output{theirs} =~ s{\r\n}{\n}g;
-       while ($output{theirs} =~ m{\n=== calling main\(\) ===\n\n}) {
+       while ($output{theirs} =~ m{\n=== calling ".*" main\(\) ===\n\n}) {
            $output{theirs} = $'; #';
        }
-       $output{theirs} =~ m{\n=== main\(\) returned (\d+) ===\n} or die;
+       $output{theirs} =~ m{\n=== main\(\) returned (\d+) ===\n} or
+       $output{theirs} =~ m{\n=== ERROR: _exit\((\d+)\) called ===\n} or die;
        $output{theirs} = $`;
        die "$1 ?" if $1 ne '0';
        $output{theirs} =~ s{^STUB \`\`\w+'' called\n}{}mg;