From 6803f5a73ba76bfceb4ab7d9952932d6e38b2e6b Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Tue, 18 Oct 2016 20:18:38 -0400 Subject: Add BSI specific Travis build Unfortunately something that is enabled in BSI but not 'modern' policy takes ages to run under qemu and causes Travis timeouts, so revert back to the old policy for the ARM builds. GH #667 --- src/scripts/ci/travis/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/scripts/ci/travis') diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index 9a4ae6375..53c8df15a 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -17,6 +17,8 @@ if [ "$BUILD_MODE" = "static" ] || [ "$BUILD_MODE" = "mini-static" ]; then elif [ "$BUILD_MODE" = "shared" ] || [ "$BUILD_MODE" = "mini-shared" ]; then # No special flags required for shared lib build CFG_FLAGS+=() +elif [ "$BUILD_MODE" = "bsi" ]; then + CFG_FLAGS+=(--module-policy=bsi) elif [ "$BUILD_MODE" = "sonarqube" ]; then # No special flags required CFG_FLAGS+=() @@ -76,12 +78,12 @@ if [ "${BUILD_MODE:0:6}" = "cross-" ]; then CC_BIN=arm-linux-gnueabihf-g++-4.8 TEST_PREFIX="qemu-arm -L /usr/arm-linux-gnueabihf/" CFG_FLAGS+=(--cpu=armv7) - CFG_FLAGS+=(--module-policy=bsi --enable-modules=tls) + CFG_FLAGS+=(--module-policy=modern --enable-modules=tls) elif [ "$BUILD_MODE" = "cross-arm64" ]; then CC_BIN=aarch64-linux-gnu-g++-4.8 TEST_PREFIX="qemu-aarch64 -L /usr/aarch64-linux-gnu/" CFG_FLAGS+=(--cpu=armv8-a) - CFG_FLAGS+=(--module-policy=bsi --enable-modules=tls) + CFG_FLAGS+=(--module-policy=modern --enable-modules=tls) elif [ "$BUILD_MODE" = "cross-ppc32" ]; then CC_BIN=powerpc-linux-gnu-g++-4.8 TEST_PREFIX="qemu-ppc -L /usr/powerpc-linux-gnu/" -- cgit v1.2.3