From f7cd9d2c6b1c79d69a3c7af4c01a6225cca1539b Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Mon, 25 Apr 2016 09:46:18 -0500
Subject: [PATCH] travis: enable building of the tools

For native (non-cross compiles) we now only require bcc, ld86, as86 for
building rombios, we can build the toolstack sans rombios and using the
system SeaBIOS due to known build issues. At the same time capture the
output of the configure scripts to help with tracking down future build
issues. This does not enable building of the toolstack with clang for
now due to multiple failures.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Andrew Cooper<andrew.cooper3@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---
 .travis.yml          |  8 ++++----
 scripts/travis-build | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100755 scripts/travis-build

diff --git a/.travis.yml b/.travis.yml
index 741a8ab7ee..0eea94e114 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,18 +75,18 @@ addons:
             - gcc-5
             - g++-5
             - clang-3.8
+            - seabios
 # we must set CXX manually instead of using 'language: cpp' due to
 # travis-ci/travis-ci#3871
 before_script:
     - export CXX=${CC/cc/++}
     - export CXX=${CXX/clang/clang++}
 script:
-    - ( [ "x${RANDCONFIG}" = "xy" ] && ( make -C xen randconfig )
-      || exit 0 )
-    - ( ./configure --disable-tools --disable-stubdom --enable-docs &&
-      make dist )
+    - ./scripts/travis-build
 after_script:
     - cat xen/.config
+    - cat tools/config.log
+    - cat docs/config.log
 notifications:
     irc:
         channels:
diff --git a/scripts/travis-build b/scripts/travis-build
new file mode 100755
index 0000000000..b553f20a71
--- /dev/null
+++ b/scripts/travis-build
@@ -0,0 +1,31 @@
+#!/bin/bash -ex
+
+# random config or default config
+if [[ "${RANDCONFIG}" == "y" ]]; then
+    make -C xen randconfig
+else
+    make -C xen defconfig
+fi
+
+# build up our configure options
+cfgargs=()
+cfgargs+=("--disable-stubdom") # more work needed into building this
+cfgargs+=("--disable-rombios")
+cfgargs+=("--enable-docs")
+cfgargs+=("--with-system-seabios=/usr/share/seabios/bios.bin")
+
+if [[ "${XEN_TARGET_ARCH}" == "x86_64" ]]; then
+    cfgargs+=("--enable-tools")
+else
+    cfgargs+=("--disable-tools") # we don't have the cross depends installed
+fi
+
+# Due to multiple build failures and the desire to get more
+# build testing (GCC only) enabled this is disabled
+if [[ "${clang}" == "y" ]]; then
+    cfgargs+=("--disable-tools")
+fi
+
+./configure "${cfgargs[@]}"
+
+make dist
-- 
2.30.2