From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH v2 10/13] rump kernel tests: Specify kernel via runvar Date: Wed, 16 Jul 2014 11:36:47 +0100 Message-ID: <1405507007-27439-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X7Ma2-0000Wn-Vg for xen-devel@lists.xenproject.org; Wed, 16 Jul 2014 10:36:59 +0000 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 [ I am sending out only this patch, which has a one line fix to the runvar setting. The others haven't changed, other than in comments and commit messages as already discussed -iwj. ] The runvar _builtimage is set to :. Previously we hardcoded `/usr/local/lib/xen/rump-kernel' in `rumpuserxen'. The ffs filesystem images, and the demo config template, still come from a single particular build, which we find from the `guests_rumpuserxenbuildjob' runvar. This runvar is then doing double duty as the build job for the ffs filesystem images and example configs, and the `default' build job for guest kernels. The subpath /usr/local/lib/xen/rump-kernel is duplicated. It now appears: 1. To find the demo guest's kernel: in make-flight, setting a runvar, with the actual rump-kernel kernel image leafname appended. 2. For the filesystem images and config file: hardcoded in ts-rumpuserxen-demo-setup. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- v2: Fix demo application kernel image filename. Disentangle wording of last para of commit message. --- make-flight | 1 + ts-rumpuserxen-demo-setup | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/make-flight b/make-flight index 8aa5396..0ab80a2 100755 --- a/make-flight +++ b/make-flight @@ -123,6 +123,7 @@ do_rumpkernel_tests () { test-rumpuserxen xl \ $xenarch $dom0arch \ guests_rumpuserxenbuildjob=build-$rumparch-rumpuserxen \ + rump_builtimage=rumpuserxen:/usr/local/lib/xen/rump-kernel/rump-kernel \ all_hostflags=$most_hostflags } diff --git a/ts-rumpuserxen-demo-setup b/ts-rumpuserxen-demo-setup index 68ec7d4..34da7cb 100755 --- a/ts-rumpuserxen-demo-setup +++ b/ts-rumpuserxen-demo-setup @@ -35,10 +35,19 @@ our $rkdist; sub prep () { $gho = prepareguest($ho, $gn, $gn, 4096, undef, 30); + my $cfg_rkdist = target_extract_jobdistpath_subdir + ($ho, 'rumpuserxen--base', 'rumpuserxen', + $r{guests_rumpuserxenbuildjob}); + $cfg_rkdist .= '/usr/local/lib/xen/rump-kernel'; + my $buildjob = guest_var($gho, 'rumpuserxenbuildjob', undef); + my $builtimage = guest_var($gho, 'builtimage', undef); + $builtimage =~ m/\:/ or die "$builtimage ?"; + my $builtimage_part = $`; + my $builtimage_subpath = $'; #'; $rkdist = target_extract_jobdistpath_subdir - ($ho, 'rumpuserxen', 'rumpuserxen', $buildjob); - $rkdist .= '/usr/local/lib/xen/rump-kernel'; + ($ho, "rumpuserxen-$gn", $builtimage_part, $buildjob); + my $imagefile = $rkdist.$builtimage_subpath; my @images; @@ -46,7 +55,7 @@ sub prep () { my $cfgfile = "$gn.cfg"; my $cfgpath = "/etc/xen/$cfgfile"; - target_editfile_root($ho, "$rkdist/domain_config", $cfgfile, $cfgpath, + target_editfile_root($ho, "$cfg_rkdist/domain_config", $cfgfile, $cfgpath, sub { while () { next if m/^\s*\#/; @@ -55,7 +64,7 @@ sub prep () { my $in = $& if m/^\w\S*/; s# = .* # " = '$gn'" #xe if $in eq 'name'; - s# =\s* ['"](.*)['"] # " = '$rkdist/$1'" #xe if $in eq 'kernel'; + 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'; -- 1.7.10.4