diff mbox

[OSSTEST,16/16] rump kernels: Build with RUMP_DEV_XEN_DEBUG and filter out debug messages

Message ID 1475858096-16123-17-git-send-email-ian.jackson@eu.citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Jackson Oct. 7, 2016, 4:34 p.m. UTC 
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ts-rumprun-build           | 5 ++++-
 ts-rumprun-demo-xenstorels | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/ts-rumprun-build b/ts-rumprun-build
index 1913f29..f408359 100755
--- a/ts-rumprun-build
+++ b/ts-rumprun-build
@@ -44,7 +44,10 @@  sub massage() {
 }
 
 sub build() {
-    target_cmd_build($ho, 7200, $rux, <<END);
+    my $debug_build = $r{rumprun_build_debug} || 'y';
+    target_cmd_build($ho, 7200, $rux, ($debug_build ? <<END : ''). <<END);
+        export RUMP_DEV_XEN_DEBUG=1
+END
         export XEN_HEADERS=$xendist/usr/local/include/xen
         (./build-rr.sh xen && touch ../build-ok-stamp) |tee ../log
         test -f ../build-ok-stamp #/
diff --git a/ts-rumprun-demo-xenstorels b/ts-rumprun-demo-xenstorels
index b5f3b28..4c45688 100755
--- a/ts-rumprun-demo-xenstorels
+++ b/ts-rumprun-demo-xenstorels
@@ -84,6 +84,8 @@  sub their_xenstorels () {
 	$output{theirs} = $`;
 	die "EXIT STATUS $1 ?" if $1 ne '0';
 	$output{theirs} =~ s{^STUB \`\`\w+'' called\n}{}mg;
+	$output{theirs} =~ s{^/dev/xen/xenbus[:[].*\n}{}mg;
+	$output{theirs} =~ s{^xen devsw:.*\n}{}mg;
     }, <<END);
         cat /var/log/xen/console/guest-$gn.log
 END