Removed the gmock download from the travis.yml

yixiaoyang · Dec 28, 2013 · 891d642 · 891d642
1 parent 0623985
commit 891d642
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,14 +19,7 @@ install:
 - gem install travis_github_deployer
 - sudo apt-get update --fix-missing
 - sudo apt-get install valgrind
-- wget https://googlemock.googlecode.com/files/gmock-1.6.0.zip
-- unzip gmock-1.6.0.zip
-- cd gmock-1.6.0
-- ./configure && make
-- cd ..
 before_script: 
-- export GMOCK_HOME=$TRAVIS_BUILD_DIR/gmock-1.6.0
-- export GTEST_HOME=$TRAVIS_BUILD_DIR/gmock-1.6.0/gtest
 - export CPPUTEST_BUILD_DIR=$TRAVIS_BUILD_DIR/cpputest_build
 - mkdir -p $CPPUTEST_BUILD_DIR && cd $CPPUTEST_BUILD_DIR
 script: 

diff --git a/scripts/travis_ci_build.sh b/scripts/travis_ci_build.sh
@@ -23,19 +23,22 @@ if [ "x$BUILDTOOL" = "xautotools" ]; then
 fi
 
 if [ "x$BUILDTOOL" = "xcmake" ]; then 
+	wget https://googlemock.googlecode.com/files/gmock-1.6.0.zip
+	unzip gmock-1.6.0.zip
+	cd gmock-1.6.0
+	./configure && make
+	cd ..
+
+	export GMOCK_HOME=$TRAVIS_BUILD_DIR/gmock-1.6.0
+	export GTEST_HOME=$TRAVIS_BUILD_DIR/gmock-1.6.0/gtest
+
+
 	cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE || exit 1
 	make || exit 1
 	ctest -V || exit 1
-fi
-
-if [ "x$BUILDTOOL" = "xcmake" ]; then 
+
 	cmake .. -DGMOCK=ON || exit 1
 	make || exit 1
 	ctest -V || exit 1
 fi
 
-if [ "x$BUILDTOOL" = "xcmake" ]; then 
-	cmake .. -DGMOCK=ON -DREAL_GTEST=ON || exit 1
-	make || exit 1
-	ctest -V || exit 1
-fi