| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | [PATCH] disable test |
| 2 | |
| 3 | Upstream-Status: Inappropriate [configuration] |
| 4 | |
| 5 | test needs gtest package, so not build the test dir |
| 6 | |
| 7 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 8 | --- |
| 9 | Makefile | 7 +++---- |
| 10 | configure.ac | 6 ------ |
| 11 | 2 files changed, 3 insertions(+), 10 deletions(-) |
| 12 | |
| 13 | diff --git a/Makefile b/Makefile |
| 14 | index 5f5fb27..5070e96 100644 |
| 15 | --- a/Makefile |
| 16 | +++ b/Makefile |
| 17 | @@ -9,8 +9,8 @@ endif |
| 18 | .PHONY: default |
| 19 | default: startup all |
| 20 | |
| 21 | -.PHONY: headers library clean veryclean all binary program doc test update-po |
| 22 | -all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs: |
| 23 | +.PHONY: headers library clean veryclean all binary program doc update-po |
| 24 | +all headers library clean veryclean binary program doc manpages docbook update-po startup dirs: |
| 25 | $(MAKE) -C vendor $@ |
| 26 | $(MAKE) -C apt-pkg $@ |
| 27 | $(MAKE) -C apt-inst $@ |
| 28 | @@ -21,9 +21,8 @@ all headers library clean veryclean binary program doc manpages docbook test upd |
| 29 | $(MAKE) -C dselect $@ |
| 30 | # $(MAKE) -C doc $@ |
| 31 | $(MAKE) -C po $@ |
| 32 | - $(MAKE) -C test $@ |
| 33 | |
| 34 | -all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs |
| 35 | +all headers library clean veryclean binary program doc manpages docbook update-po: startup dirs |
| 36 | |
| 37 | dirs: startup |
| 38 | |
| 39 | diff --git a/configure.ac b/configure.ac |
| 40 | index 5663aaf..b0f9564 100644 |
| 41 | --- a/configure.ac |
| 42 | +++ b/configure.ac |
| 43 | @@ -89,12 +89,6 @@ AC_CHECK_LIB(curl, curl_easy_init, |
| 44 | AC_MSG_ERROR([failed: I need CURL due https support]), |
| 45 | ) |
| 46 | |
| 47 | -AC_LANG_PUSH([C++]) |
| 48 | -AC_CHECK_HEADER(gtest/gtest.h,, |
| 49 | - AC_MSG_ERROR([failed: I need gtest to build tests]), |
| 50 | -) |
| 51 | -AC_LANG_POP([C++]) |
| 52 | - |
| 53 | |
| 54 | AC_SUBST(BDBLIB) |
| 55 | |
| 56 | -- |
| 57 | 1.9.1 |
| 58 | |