debian/gbp.conf: point debian-branch to master

[apt.git] / test / libapt / makefile

diff --git a/test/libapt/makefile b/test/libapt/makefile
index 7f23ace46dd0de3e32bceb49ab5cc79537d9c69f..5ff9cf68a2a1d4e617d8fa7f7a22e00164ab6de2 100644 (file)
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -8,14 +8,15 @@ APT_DOMAIN=none
 include ../../buildlib/defaults.mak
 
 .PHONY: test
+ifeq (file-okay,$(shell $(CC) -I $(BASE)/build/include -M gtest_runner.cc >/dev/null 2>&1 && echo 'file-okay'))
 test: $(BIN)/gtest$(BASENAME)
        MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=$(LIB) $(BIN)/gtest$(BASENAME)
 
 $(BIN)/gtest$(BASENAME): $(LIB)/gtest.a
 
 PROGRAM = gtest${BASENAME}
-SLIBS = -lapt-pkg -lapt-private -pthread $(LIB)/gtest.a
-LIB_MAKES = apt-pkg/makefile apt-private/makefile
+SLIBS = -lapt-pkg -lapt-private -lapt-inst -pthread $(LIB)/gtest.a
+LIB_MAKES = apt-pkg/makefile apt-private/makefile apt-inst/makefile
 SOURCE = gtest_runner.cc $(wildcard *-helpers.cc *_test.cc)
 include $(PROGRAM_H)
 
@@ -32,7 +33,7 @@ GTEST_DIR = /usr/src/gtest
 # Flags passed to the preprocessor.
 # Set Google Test's header directory as a system directory, such that
 # the compiler doesn't generate warnings in Google Test headers.
-CPPFLAGS += -isystem $(GTEST_DIR)/include
+#CPPFLAGS += -isystem $(GTEST_DIR)/include
 
 # Flags passed to the C++ compiler.
 CXXFLAGS += -pthread
@@ -40,6 +41,7 @@ CXXFLAGS += -pthread
 CXXFLAGS+= -Wno-missing-declarations
 CXXFLAGS+= -Wno-missing-field-initializers
 CXXFLAGS+= -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wno-suggest-attribute=noreturn
+CXXFLAGS+= -Wno-undef
 
 # All Google Test headers.  Usually you shouldn't change this definition.
 GTEST_HEADERS = /usr/include/gtest/*.h \
@@ -71,3 +73,12 @@ $(LIB)/gtest.a: $(OBJ)/gtest-all.o
        echo Building static library $@
        -rm -f $@
        $(AR) $(ARFLAGS) $@ $^
+
+else
+test:
+       @echo "APT uses Googles C++ testing framework for its unit tests"
+       @echo "On Debian systems this is available in the 'libgtest-dev' package."
+       @echo "Please install it before attempting to run the unit tests."
+       $(CC) -I $(BASE)/build/include -M gtest_runner.cc
+       exit 100
+endif