From 627b53b4941600f278b8b9f222e4e2574e8e9d74 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 5 Oct 2013 23:50:28 +0400 Subject: [PATCH] Fix test, make travis output more verbose --- .travis.yml | 4 ++-- Makefile.in | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6036703e..54c16839 100644 --- 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 test + - make V=1 + - make V=1 test - sudo make install notifications: irc: diff --git a/Makefile.in b/Makefile.in index a9ca9e6d..4e14d9fe 100644 --- 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 test/gtest-$(GTEST_VER)/fused-src/gtest/gtest-all.cc - $(Q)test -r test/gtest-$(GTEST_VER)/fused-src/gtest/gtest_main.cc - $(Q)touch -c test/gtest-$(GTEST_VER)/fused-src/gtest/gtest-all.cc test/gtest-$(GTEST_VER)/fused-src/gtest/gtest_main.cc + $(Q)test -r $@ || unzip $^ -d test/ + $(Q)test -r $@ + $(Q)touch -c $@ 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