Fix test, make travis output more verbose

znc · Oct 5, 2013 · 627b53b · 627b53b
1 parent e13bfa1
commit 627b53b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,8 @@ script:
     - mkdir build
     - cd build
     - ../configure --enable-perl --enable-python --enable-tcl --enable-cyrus
-    - make
+    - make V=1
-    - make test
+    - make V=1 test
     - sudo make install
 notifications:
     irc:

diff --git a/Makefile.in b/Makefile.in
@@ -132,12 +132,11 @@ test/gtest.zip:
 	$(E) Downloading GoogleTest $(GTEST_VER)
 	$(Q)wget http://googletest.googlecode.com/files/gtest-$(GTEST_VER).zip -O $@
 
-test/gtest-$(GTEST_VER)/fused-src/gtest/gtest-all.cc test/gtest-$(GTEST_VER)/fused-src/gtest/gtest_main.cc: test/gtest.zip
+test/gtest-$(GTEST_VER)/fused-src/gtest/gtest-all.cc test/gtest-$(GTEST_VER)/fused-src/gtest/gtest_main.cc test/gtest-$(GTEST_VER)/fused-src/gtest/gtest.h: test/gtest.zip
 	$(E) Unpacking GoogleTest $(GTEST_VER)
-	$(Q)unzip $^ -d test/
+	$(Q)test -r $@ || unzip $^ -d test/
-	$(Q)test -r test/gtest-$(GTEST_VER)/fused-src/gtest/gtest-all.cc
+	$(Q)test -r $@
-	$(Q)test -r test/gtest-$(GTEST_VER)/fused-src/gtest/gtest_main.cc
+	$(Q)touch -c $@
-	$(Q)touch -c test/gtest-$(GTEST_VER)/fused-src/gtest/gtest-all.cc test/gtest-$(GTEST_VER)/fused-src/gtest/gtest_main.cc
 
 ifneq "THIS_IS_NOT_NIGHTLY" ""
 # If git commit was changed since previous build, add a phony target to dependencies, forcing version.o to be recompiled