From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org, Ian.Jackson@eu.citrix.com
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH 1/7] osstest: make built_stash_file store a path_ runvar for each file
Date: Tue, 23 May 2017 14:51:42 +0100 [thread overview]
Message-ID: <20170523135148.77673-2-roger.pau@citrix.com> (raw)
In-Reply-To: <20170523135148.77673-1-roger.pau@citrix.com>
And introduce built_stash_debugfile in order the keep the previous behavior of
built_stash_file.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
Osstest/TestSupport.pm | 14 ++++++++++++--
ts-kernel-build | 4 ++--
ts-xen-build | 8 ++++----
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index c23ac135..5f13eb0b 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -83,7 +83,7 @@ BEGIN {
get_stashed open_unique_stashfile compress_stashed
dir_identify_vcs
build_url_vcs build_clone
- built_stash built_stash_file
+ built_stash built_stash_file built_stash_debugfile
built_compress_stashed
hg_dir_revision git_dir_revision vcs_dir_revision
store_revision store_vcs_revision
@@ -1445,7 +1445,7 @@ END
store_runvar("path_$item", $stashleaf);
}
-sub built_stash_file ($$$$;$) {
+sub built_stash_debugfile ($$$$;$) {
my ($ho, $builddir, $item, $fname, $optional) = @_;
my $build= "build";
my $stashleaf= "$build/$item";
@@ -1458,6 +1458,16 @@ sub built_stash_file ($$$$;$) {
"$stash/$stashleaf");
}
+sub built_stash_file ($$$$;$) {
+ my ($ho, $builddir, $item, $fname, $optional) = @_;
+ my $build= "build";
+ my $stashleaf= "$build/$item";
+
+ built_stash_debugfile($ho, $builddir, $item, $fname, $optional);
+ store_runvar("path_$item", $stashleaf);
+}
+
+
sub built_compress_stashed($) {
my ($path) = @_;
compress_stashed("build/$path");
diff --git a/ts-kernel-build b/ts-kernel-build
index 94e67a47..5b87f5a7 100755
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -438,9 +438,9 @@ if ($r{tree_linuxfirmware}) {
fwinstall();
}
built_stash($ho, $builddir, 'dist', 'kerndist');
-built_stash_file($ho, $builddir, 'vmlinux', 'linux/vmlinux');
+built_stash_debugfile($ho, $builddir, 'vmlinux', 'linux/vmlinux');
built_compress_stashed('vmlinux');
-built_stash_file($ho, $builddir, 'config', 'linux/.config');
+built_stash_debugfile($ho, $builddir, 'config', 'linux/.config');
sub enable_xen_config () {
return <<'END';
diff --git a/ts-xen-build b/ts-xen-build
index 31acb9dd..0152ea05 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -209,10 +209,10 @@ sub stash () {
"xen/dist/${part}install",
"${part}dist");
}
- built_stash_file($ho, $builddir, "xen-syms", "xen/xen/xen-syms", 1);
- built_stash_file($ho, $builddir, "xen-config", "xen/.config", 1);
- built_stash_file($ho, $builddir, "xen-hv-config", "xen/xen/.config", 1);
- built_stash_file($ho, $builddir, "seabios-config",
+ built_stash_debugfile($ho, $builddir, "xen-syms", "xen/xen/xen-syms", 1);
+ built_stash_debugfile($ho, $builddir, "xen-config", "xen/.config", 1);
+ built_stash_debugfile($ho, $builddir, "xen-hv-config", "xen/xen/.config", 1);
+ built_stash_debugfile($ho, $builddir, "seabios-config",
"xen/tools/firmware/seabios-dir-remote/.config", 1);
built_compress_stashed("xen-syms");
}
--
2.11.0 (Apple Git-81)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-05-23 13:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 13:51 [PATCH 0/7] osstest: initial FreeBSD support Roger Pau Monne
2017-05-23 13:51 ` Roger Pau Monne [this message]
2017-05-23 14:55 ` [PATCH 1/7] osstest: make built_stash_file store a path_ runvar for each file Ian Jackson
2017-05-23 13:51 ` [PATCH 2/7] osstest: move known_hosts generation to TestSupport Roger Pau Monne
2017-05-23 14:56 ` Ian Jackson
2017-05-23 13:51 ` [PATCH 3/7] osstest: fix regular expression used to match buildjob in ts-build-check Roger Pau Monne
2017-05-23 15:01 ` Ian Jackson
2017-05-24 7:18 ` Roger Pau Monne
2017-05-23 13:51 ` [PATCH 4/7] osstest: add a FreeBSD host install recipe Roger Pau Monne
2017-05-23 16:04 ` Ian Jackson
2017-05-24 10:48 ` Roger Pau Monne
2017-05-24 11:12 ` Ian Jackson
2017-05-23 17:14 ` Ian Jackson
2017-05-23 13:51 ` [PATCH 5/7] osstest: introduce a FreeBSD build script Roger Pau Monne
2017-05-23 17:58 ` Ian Jackson
2017-05-24 14:15 ` Roger Pau Monne
2017-05-24 14:19 ` Ian Jackson
2017-05-23 13:51 ` [PATCH 6/7] osstest: add a FreeBSD build to flights Roger Pau Monne
2017-05-23 13:51 ` [PATCH 7/7] osstest: introduce make-freebsd-flight Roger Pau Monne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170523135148.77673-2-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.