diff --git a/test/.gitignore b/test/.gitignore index c70f5f9..322ac98 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,5 +1,5 @@ -gtest-1.7.0.zip -gtest-1.7.0/ *.o *.a test.out +release-1.8.0.tar.gz +googletest-release-1.8.0 diff --git a/test/Makefile b/test/Makefile index d56b5c8..d1ee92d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,6 @@ COMPILER_FLAGS = -Wall -g -O0 -pipe -std=c++11 -Wno-sign-compare LINKER_FLAGS = -INC = -I../ -I. -Igtest-1.7.0/include +INC = -I../ -I. -Igoogletest-release-1.8.0/googletest/include COMPILER = c++ LINKER = c++ @@ -19,9 +19,9 @@ ${BINARY}: ${DEPS} main.cpp ${LINKER} ${LINKER_FLAGS} ${INC} -o ${BINARY} ${DEPS} libgtest.a -pthread ../libsmarttpl.so libgtest.a: - wget -q https://googletest.googlecode.com/files/gtest-1.7.0.zip - unzip -qq gtest-1.7.0.zip - ${COMPILER} ${COMPILER_FLAGS} -I gtest-1.7.0/include -I gtest-1.7.0 -c gtest-1.7.0/src/gtest-all.cc + wget -q https://github.com/google/googletest/archive/release-1.8.0.tar.gz + tar -xf release-1.8.0.tar.gz + ${COMPILER} ${COMPILER_FLAGS} -I googletest-release-1.8.0/googletest/include -I googletest-release-1.8.0/googletest -c googletest-release-1.8.0/googletest/src/gtest-all.cc ar -rv libgtest.a gtest-all.o .PHONY: test