* [PATCH OSSTEST] ts-xen-build: make collection on xen-syms optional
@ 2013-11-01 13:03 Ian Campbell
2013-11-01 15:41 ` Ian Jackson
0 siblings, 1 reply; 3+ messages in thread
From: Ian Campbell @ 2013-11-01 13:03 UTC (permalink / raw)
To: ian.jackson; +Cc: Ian Campbell, xen-devel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-01 15:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-01 13:03 [PATCH OSSTEST] ts-xen-build: make collection on xen-syms optional Ian Campbell
2013-11-01 15:41 ` Ian Jackson
2013-11-01 15:49 ` Ian Campbell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).