From 67bc7948e0a721c75d636931abc105da5dcb0763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Thu, 26 May 2016 15:32:11 -0500 Subject: [PATCH] [PATCH] disable test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [configuration] test needs gtest package, so not build the test dir Signed-off-by: Roy Li Signed-off-by: Aníbal Limón --- Makefile | 9 +++------ configure.ac | 7 ------- 2 files changed, 3 insertions(+), 13 deletions(-) Index: apt-1.2.24/Makefile =================================================================== --- apt-1.2.24.orig/Makefile +++ apt-1.2.24/Makefile @@ -9,8 +9,8 @@ endif .PHONY: default default: startup all -.PHONY: fast headers library clean veryclean all binary program doc test update-po -all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs: +.PHONY: fast headers library clean veryclean all binary program doc update-po +all headers library clean veryclean binary program doc manpages docbook update-po startup dirs: $(MAKE) -C vendor $@ $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ @@ -21,8 +21,6 @@ all headers library clean veryclean bina $(MAKE) -C dselect $@ # $(MAKE) -C doc $@ $(MAKE) -C po $@ - # FIXME: -C test has issue swith parallel builds, investigate! - -$(MAKE) -C test $@ fast: $(MAKE) -C vendor all @@ -32,9 +30,8 @@ fast: $(MAKE) -C methods all $(MAKE) -C cmdline all $(MAKE) -C ftparchive all - $(MAKE) -C test all -all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs +all headers library clean veryclean binary program doc manpages docbook update-po: startup dirs dirs: startup Index: apt-1.2.24/configure.ac =================================================================== --- apt-1.2.24.orig/configure.ac +++ apt-1.2.24/configure.ac @@ -90,13 +90,6 @@ AC_CHECK_LIB(curl, curl_easy_init, AC_MSG_ERROR([failed: I need CURL due https support]), ) -AC_LANG_PUSH([C++]) -AC_CHECK_HEADER(gtest/gtest.h,, - AC_MSG_WARN([failed: I need gtest (packaged as libgtest-dev) for unit testing]), -) -AC_LANG_POP([C++]) - - AC_SUBST(BDBLIB) HAVE_ZLIB=no