diff --git a/.travis.yml b/.travis.yml index f32532465..bfe7412a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,6 @@ addons: script: - ./configure $BUILD_CONFIG - - make - - if [ $RUN_TEST -eq 1 ]; then make test; fi + - make CC=gcc-4.8 + - if [ $RUN_TEST -eq 1 ]; then make BLIS_ENABLE_TEST_OUTPUT=yes test; fi - if [ $RUN_TEST -eq 1 ]; then ./build/check-test.sh ./output.testsuite; fi \ No newline at end of file diff --git a/Makefile b/Makefile index 9ad0d7568..c9fe957b5 100644 --- a/Makefile +++ b/Makefile @@ -633,6 +633,11 @@ ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes) ./$(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \ -o $(TESTSUITE_CONF_OPS_PATH) \ > $(TESTSUITE_OUT_FILE) + +else ifeq ($(BLIS_ENABLE_TEST_OUTPUT), yes) + ./$(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \ + -o $(TESTSUITE_CONF_OPS_PATH) | \ + tee $(TESTSUITE_OUT_FILE) else @echo "Running $(TESTSUITE_BIN) with output redirected to '$(TESTSUITE_OUT_FILE)'" @./$(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \