| Message ID | 1475858096-16123-12-git-send-email-ian.jackson@eu.citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/ts-rumprun-demo-xenstorels b/ts-rumprun-demo-xenstorels index 3d29c46..b5f3b28 100755 --- a/ts-rumprun-demo-xenstorels +++ b/ts-rumprun-demo-xenstorels @@ -80,8 +80,7 @@ sub their_xenstorels () { while ($output{theirs} =~ m{\n=== calling ".*" main\(\) ===\n\n}) { $output{theirs} = $'; #'; } - $output{theirs} =~ m{\n=== main\(\) returned (\d+) ===\n} or - $output{theirs} =~ m{\n=== ERROR: _exit\((\d+)\) called ===\n} or die; + $output{theirs} =~ m{\n=== main\(\) .* returned (\d+) ===\n} or die; $output{theirs} = $`; die "EXIT STATUS $1 ?" if $1 ne '0'; $output{theirs} =~ s{^STUB \`\`\w+'' called\n}{}mg;
There is no need to match the _exit. We can match the main return as before, provided we tolerate the way it now says main() of "program" returned 0 This is an update to ea13503bc853 "rumprun: xenstorels: New regexps for finding output" (which was insufficient to get the xenstorels test to pass). Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- ts-rumprun-demo-xenstorels | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)