From 1838314167143bf799ae5f15ca90deac0c194a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Mon, 25 Aug 2014 07:39:31 +0200 Subject: [PATCH] tests: fix build of tests when the build directory is outside source tree (closes #178) (cherry picked from commit f39b37351c509c180475dbdfbe01001ebfac13a4) --- ChangeLog.asciidoc | 2 ++ tests/CMakeLists.txt | 3 +-- tests/tests.cpp | 14 +++++++------- tests/unit/core/test-eval.cpp | 10 +++++----- tests/unit/core/test-hashtable.cpp | 4 ++-- tests/unit/core/test-hdata.cpp | 2 +- tests/unit/core/test-infolist.cpp | 2 +- tests/unit/core/test-list.cpp | 2 +- tests/unit/core/test-string.cpp | 4 ++-- tests/unit/core/test-url.cpp | 2 +- tests/unit/core/test-utf8.cpp | 4 ++-- tests/unit/core/test-util.cpp | 2 +- 12 files changed, 26 insertions(+), 25 deletions(-) diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 2451abcd6..ad7f2c159 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -19,6 +19,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * core: fix modifier "weechat_print": discard only one line when several lines are displayed in same message (closes #171) +* tests: fix build of tests when the build directory is outside source tree + (closes #178) * tests: fix memory leak in tests launcher * aspell: fix crash with command "/aspell addword" if no word is given (closes #164, closes #165) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 43d9f2e52..4a9a9132c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -26,8 +26,7 @@ set(LIB_WEECHAT_NCURSES_FAKE_SRC ncurses-fake.c) add_library(weechat_ncurses_fake STATIC ${LIB_WEECHAT_NCURSES_FAKE_SRC}) remove_definitions(-DHAVE_CONFIG_H) -include_directories(${CPPUTEST_INCLUDE_DIRS}) -include_directories(${PROJECT_BINARY_DIR}) +include_directories(${CPPUTEST_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}) # unit tests set(LIB_WEECHAT_UNIT_TESTS_SRC diff --git a/tests/tests.cpp b/tests/tests.cpp index 94bf8f536..95e3e9b33 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -32,13 +32,13 @@ extern "C" #ifndef HAVE_CONFIG_H #define HAVE_CONFIG_H #endif -#include "../src/core/weechat.h" -#include "../src/core/wee-hook.h" -#include "../src/core/wee-input.h" -#include "../src/core/wee-string.h" -#include "../src/plugins/plugin.h" -#include "../src/gui/gui-main.h" -#include "../src/gui/gui-buffer.h" +#include "src/core/weechat.h" +#include "src/core/wee-hook.h" +#include "src/core/wee-input.h" +#include "src/core/wee-string.h" +#include "src/plugins/plugin.h" +#include "src/gui/gui-main.h" +#include "src/gui/gui-buffer.h" extern void gui_main_init (); extern void gui_main_loop (); diff --git a/tests/unit/core/test-eval.cpp b/tests/unit/core/test-eval.cpp index 131bd8959..203860f47 100644 --- a/tests/unit/core/test-eval.cpp +++ b/tests/unit/core/test-eval.cpp @@ -24,11 +24,11 @@ extern "C" { #include -#include "../src/core/wee-eval.h" -#include "../src/core/wee-config.h" -#include "../src/core/wee-hashtable.h" -#include "../src/core/wee-version.h" -#include "../src/plugins/plugin.h" +#include "src/core/wee-eval.h" +#include "src/core/wee-config.h" +#include "src/core/wee-hashtable.h" +#include "src/core/wee-version.h" +#include "src/plugins/plugin.h" } #define WEE_CHECK_EVAL(__result, __expr) \ diff --git a/tests/unit/core/test-hashtable.cpp b/tests/unit/core/test-hashtable.cpp index fb030f2ba..bd4d14fbe 100644 --- a/tests/unit/core/test-hashtable.cpp +++ b/tests/unit/core/test-hashtable.cpp @@ -24,8 +24,8 @@ extern "C" { #include -#include "../src/core/wee-hashtable.h" -#include "../src/plugins/plugin.h" +#include "src/core/wee-hashtable.h" +#include "src/plugins/plugin.h" } TEST_GROUP(Hashtable) diff --git a/tests/unit/core/test-hdata.cpp b/tests/unit/core/test-hdata.cpp index 31af084a0..400f7e847 100644 --- a/tests/unit/core/test-hdata.cpp +++ b/tests/unit/core/test-hdata.cpp @@ -23,7 +23,7 @@ extern "C" { -#include "../src/core/wee-hdata.h" +#include "src/core/wee-hdata.h" } TEST_GROUP(Hdata) diff --git a/tests/unit/core/test-infolist.cpp b/tests/unit/core/test-infolist.cpp index 6b7a67c11..e559f15d2 100644 --- a/tests/unit/core/test-infolist.cpp +++ b/tests/unit/core/test-infolist.cpp @@ -23,7 +23,7 @@ extern "C" { -#include "../src/core/wee-infolist.h" +#include "src/core/wee-infolist.h" } TEST_GROUP(Infolist) diff --git a/tests/unit/core/test-list.cpp b/tests/unit/core/test-list.cpp index 7e804c1f2..9f5e4c3c7 100644 --- a/tests/unit/core/test-list.cpp +++ b/tests/unit/core/test-list.cpp @@ -23,7 +23,7 @@ extern "C" { -#include "../src/core/wee-list.h" +#include "src/core/wee-list.h" } TEST_GROUP(List) diff --git a/tests/unit/core/test-string.cpp b/tests/unit/core/test-string.cpp index 9851e3a9d..a7d2d48c2 100644 --- a/tests/unit/core/test-string.cpp +++ b/tests/unit/core/test-string.cpp @@ -26,8 +26,8 @@ extern "C" #include #include #include -#include "../tests/tests.h" -#include "../src/core/wee-string.h" +#include "tests/tests.h" +#include "src/core/wee-string.h" } #define ONE_KB 1000ULL diff --git a/tests/unit/core/test-url.cpp b/tests/unit/core/test-url.cpp index 5401af156..837ad4c29 100644 --- a/tests/unit/core/test-url.cpp +++ b/tests/unit/core/test-url.cpp @@ -23,7 +23,7 @@ extern "C" { -#include "../src/core/wee-url.h" +#include "src/core/wee-url.h" } TEST_GROUP(Url) diff --git a/tests/unit/core/test-utf8.cpp b/tests/unit/core/test-utf8.cpp index ef430d9e5..b7f567281 100644 --- a/tests/unit/core/test-utf8.cpp +++ b/tests/unit/core/test-utf8.cpp @@ -26,8 +26,8 @@ extern "C" #include #include #include -#include "../tests/tests.h" -#include "../src/core/wee-utf8.h" +#include "tests/tests.h" +#include "src/core/wee-utf8.h" } const char *noel_valid = "no\xc3\xabl"; /* noël */ diff --git a/tests/unit/core/test-util.cpp b/tests/unit/core/test-util.cpp index 96a930e0c..84f5a2df2 100644 --- a/tests/unit/core/test-util.cpp +++ b/tests/unit/core/test-util.cpp @@ -27,7 +27,7 @@ extern "C" #include #include #include -#include "../src/core/wee-util.h" +#include "src/core/wee-util.h" } TEST_GROUP(Util)