From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 11/13] rump kernel tests: Specify cmdline via runvar Date: Tue, 15 Jul 2014 16:22:25 +0100 Message-ID: <1405437747-12753-12-git-send-email-ian.jackson@eu.citrix.com> References: <1405437747-12753-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X74Z0-0005kT-1z for xen-devel@lists.xenproject.org; Tue, 15 Jul 2014 15:22:42 +0000 In-Reply-To: <1405437747-12753-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org The runvar _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 --- make-flight | 1 + ts-rumpuserxen-demo-setup | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/make-flight b/make-flight index cede756..ccfa3e3 100755 --- 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_cmdline=3 \ all_hostflags=$most_hostflags } diff --git a/ts-rumpuserxen-demo-setup b/ts-rumpuserxen-demo-setup index 34da7cb..04ed0b9 100755 --- 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}{ -- 1.7.10.4