The framing output in rumprun upstream has changed.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
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;