rump kernel tests: Specify cmdline via runvar

The runvar <gn>_cmdline is used for the rumpuserxen guest command
line.  Previously "3" (a binary flags word meaningful to the test/demo
program included in rumpuser-xen.git) was hardcoded.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/make-flight b/make-flight
index 0ab80a2b7a08f36e8d1c2c77abca8fcbbef9628b..2b6b2d1ca759dc1b21764030740d6bd0af0b85c2 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -124,6 +124,7 @@ do_rumpkernel_tests () {
             $xenarch $dom0arch                                       \
             guests_rumpuserxenbuildjob=build-$rumparch-rumpuserxen   \
      rump_builtimage=rumpuserxen:/usr/local/lib/xen/rump-kernel/rump-kernel \
+            rump_cmdline=3                                           \
             all_hostflags=$most_hostflags
 }
 

diff --git a/ts-rumpuserxen-demo-setup b/ts-rumpuserxen-demo-setup
index 34da7cb2b8bd3f8cc0e42cc9225720fbcdc05772..04ed0b998f2269ffeac34a15827b466c76a5c090 100755 (executable)
--- a/ts-rumpuserxen-demo-setup
+++ b/ts-rumpuserxen-demo-setup
@@ -48,6 +48,7 @@ sub prep () {
     $rkdist = target_extract_jobdistpath_subdir
        ($ho, "rumpuserxen-$gn", $builtimage_part, $buildjob);
     my $imagefile = $rkdist.$builtimage_subpath;
+    my $cmdline = guest_var($gho, 'cmdline', undef);
 
     my @images;
 
@@ -66,7 +67,7 @@ sub prep () {
            s# = .*              # " = '$gn'"          #xe  if $in eq 'name';
            s# = .*              # " = '$imagefile'"   #xe  if $in eq 'kernel';
            s#\b mac=[0-9a-f:]+  # "mac=$gho->{Ether}" #xe  if $in eq 'vif';
-           s#\b 4             \b# 3                   #xe  if $in eq 'extra';
+           s# = .*              # " = '$cmdline'"     #xe  if $in eq 'extra';
 
            if ($in eq 'disk') {
                s{\b img/(\w+.ffs) \b}{