Merge pull request #39 from seomoz/tlb/version-and-compilation-updates

Updated googletest submodule to latest version and fixed compilation issues
seomoz · May 23, 2019 · 8afac6e · 8afac6e
2 parents a2f304e + c52f8ca
commit 8afac6e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: false
-dist: trusty
+dist: bionic
 git:
   submodules: true
 compiler:

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ BINARIES      =
 all: test release/librep.o $(BINARIES)
 
 $(GTEST_DIR)/libgtest.a:
-	g++ -isystem $(GTEST_DIR)/include -I$(GTEST_DIR) -pthread -c $(GTEST_DIR)/src/gtest-all.cc -o $(GTEST_DIR)/libgtest.a
+	g++ -std=c++11 -isystem $(GTEST_DIR)/include -I$(GTEST_DIR) -pthread -c $(GTEST_DIR)/src/gtest-all.cc -o $(GTEST_DIR)/libgtest.a
 
 # Release libraries
 release:
@@ -60,4 +60,4 @@ test: test-all
 	./scripts/check-coverage.sh $(PWD)
 
 clean:
-	rm -rf debug release test-all bench test/*.o deps/url-cpp/{debug,release}
+	rm -rf debug release test-all bench test/*.o test/*.gcda test/*.gcno deps/url-cpp/debug deps/url-cpp/release
diff --git a/deps/googletest b/deps/googletest
diff --git a/test/test-agent.cpp b/test/test-agent.cpp
@@ -5,7 +5,7 @@
 TEST(AgentTest, Basic)
 {
     Rep::Agent agent = Rep::Agent("a.com").allow("/").disallow("/foo");
-    EXPECT_EQ(agent.directives().size(), 2);
+    EXPECT_EQ(agent.directives().size(), 2ul);
 }
 
 TEST(AgentTest, ChecksAllowed)