Test 'make install' as part of cpp build. Remove 'install' job

2 files changed, 6 insertions, 15 deletions

diff --git a/travis/travis-build-cpp.sh b/travis/travis-build-cpp.sh
index d5ac94fa6b9..f1a9954ed92 100755
--- a/travis/travis-build-cpp.sh
+++ b/travis/travis-build-cpp.sh
@@ -8,8 +8,13 @@ source ${SOURCE_DIR}/travis/cpp-prelude.sh
 BUILD_DIR=~/build
 mkdir "${BUILD_DIR}"
 
+cd ${SOURCE_DIR}
+./boostrap.sh java
+mvn install --no-snapshot-updates --batch-mode --threads ${NUM_THREADS} \
+            -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true
 cd ${BUILD_DIR}
-bash ${SOURCE_DIR}/bootstrap-cpp.sh ${SOURCE_DIR} ${BUILD_DIR}
+bash ${SOURCE_DIR}/bootstrap-cmake.sh ${SOURCE_DIR}
 make -j ${NUM_THREADS}
+make install
 ctest3 --output-on-failure -j ${NUM_THREADS}
 ccache --show-stats
diff --git a/travis/travis-build-install.sh b/travis/travis-build-install.sh
deleted file mode 100755
index 6469a346045..00000000000
--- a/travis/travis-build-install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-set -e
-
-source /source/travis/prelude.sh
-source ${SOURCE_DIR}/travis/cpp-prelude.sh
-
-cd ${SOURCE_DIR}
-sh ./bootstrap.sh java
-mvn install --no-snapshot-updates --batch-mode --threads ${NUM_THREADS} --quiet\
-            -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true
-bash ${SOURCE_DIR}/bootstrap-cmake.sh ${SOURCE_DIR} "-DEXCLUDE_TESTS_FROM_ALL=TRUE"
-make -j ${NUM_THREADS}
-make install