From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST] ts-xen-build: make collection on xen-syms optional Date: Fri, 1 Nov 2013 13:03:00 +0000 Message-ID: <1383310980-8000-1-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Fixes things on i386 for branches which no longer build an i386 hypervisor. --- Osstest/TestSupport.pm | 8 ++++++-- ts-xen-build | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 1ac4cf7..d2e29d0 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -846,6 +846,7 @@ sub get_stashed ($$) { sub compress_stashed($) { my ($path) = @_; + return unless -e "$stash/$path"; my $r= system 'gzip','-9vf','--',"$stash/$path"; die "$r $!" if $r; } @@ -1051,10 +1052,13 @@ END store_runvar("path_$item", $stashleaf); } -sub built_stash_file ($$$$) { - my ($ho, $builddir, $item, $fname) = @_; +sub built_stash_file ($$$$;$) { + my ($ho, $builddir, $item, $fname, $optional) = @_; my $build= "build"; my $stashleaf= "$build/$item"; + + return if $optional && !target_file_exists($ho, "$builddir/$fname"); + ensuredir("$stash/$build"); target_getfile($ho, 300, "$builddir/$fname", diff --git a/ts-xen-build b/ts-xen-build index 5f544df..ebb7d6f 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -198,7 +198,7 @@ sub stash () { "xen-unstable/dist/${part}install", "${part}dist"); } - built_stash_file($ho, $builddir, "xen-syms", "xen-unstable/xen/xen-syms"); + built_stash_file($ho, $builddir, "xen-syms", "xen-unstable/xen/xen-syms", 1); built_compress_stashed("xen-syms"); } -- 1.7.10.4