Fix test initialization

rshipp · Mar 31, 2016 · d17c1e3 · d17c1e3
1 parent 756c1eb
commit d17c1e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/makefile b/makefile
@@ -83,11 +83,11 @@ bin/%.o: src/%.cpp
 	$(CXX) $(CPPFLAGS) $< -c -o $@
 
 # Build gtest_main.a.
-bin/gtest-all.o: $(GTEST_SRCS_) | bin
+bin/gtest-all.o: $(GTEST_HEADERS) | bin
 	$(CXX) $(TEST_CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
             $(GTEST_DIR)/src/gtest-all.cc -o $@
 
-bin/gtest_main.o: $(GTEST_SRCS_) | bin
+bin/gtest_main.o: $(GTEST_HEADERS) | bin
 	$(CXX) $(TEST_CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
             $(GTEST_DIR)/src/gtest_main.cc -o $@
 

diff --git a/src/flag_parser/flag_parser_tests.cpp b/src/flag_parser/flag_parser_tests.cpp
@@ -160,7 +160,7 @@ bool parse_flags(initializer_list<string> arg_list, FlagOptions& flags) {
 
   args.insert(args.begin(), "binary-name");
 
-  for (int i = 0; i < args.size(); i++) {
+  for (size_t i = 0; i < args.size(); i++) {
     argv.push_back((char*) args[i].c_str());
   }