From ea13503bc853f621bbc27dd13b2cfabb7fc5219e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 1 Jul 2016 19:16:41 +0100 Subject: [PATCH] rumprun: xenstorels: New regexps for finding output The framing output in rumprun upstream has changed. Signed-off-by: Ian Jackson --- ts-rumprun-demo-xenstorels | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ts-rumprun-demo-xenstorels b/ts-rumprun-demo-xenstorels index a40110a..831c58a 100755 --- a/ts-rumprun-demo-xenstorels +++ b/ts-rumprun-demo-xenstorels @@ -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; -- 2.39.5