@@ -41,19 +41,29 @@ cp xen/.config xen-config
# Directory for the artefacts to be dumped into
mkdir -p binaries
+collect_xen_artifacts()
+{
+ local f
+ for f in xen/xen xen/xen.efi; do
+ if [[ -f $f ]]; then
+ cp $f binaries/
+ fi
+ done
+}
+
if [[ "${CPPCHECK}" == "y" ]] && [[ "${HYPERVISOR_ONLY}" == "y" ]]; then
# Cppcheck analysis invokes Xen-only build
xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc)
# Preserve artefacts
- cp xen/xen binaries/xen
+ collect_xen_artifacts
cp xen/cppcheck-report/xen-cppcheck.txt xen-cppcheck.txt
elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then
# Xen-only build
make -j$(nproc) xen
# Preserve artefacts
- cp xen/xen binaries/xen
+ collect_xen_artifacts
else
# Full build. Figure out our ./configure options
cfgargs=()
@@ -101,5 +111,5 @@ else
# even though dist/ contains everything, while some containers don't even
# build Xen
cp -r dist binaries/
- if [[ -f xen/xen ]] ; then cp xen/xen binaries/xen; fi
+ collect_xen_artifacts
fi
It will be useful for further tests. Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> --- Changes in v2: - deduplicate via collect_xen_artifacts function --- automation/scripts/build | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)