summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Antonuk <aega@med.umich.edu>2012-05-22 14:53:15 -0400
committerAlan Antonuk <aega@med.umich.edu>2012-05-24 15:47:11 -0400
commitc29a40c2ffe48e174f1c212ac715b528693f3edc (patch)
tree9ef25c757f804e75402b6c410afa873af4671d10
parentff4e6a2bdf390e0bd6472b7b14baa4d941dff4a2 (diff)
downloadrabbitmq-c-github-ask-c29a40c2ffe48e174f1c212ac715b528693f3edc.tar.gz
Adding tests/ directory to CMake build
-rw-r--r--CMakeLists.txt6
-rw-r--r--tests/CMakeLists.txt10
-rw-r--r--tests/test_tables.c2
3 files changed, 17 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 168416c..194c25a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON)
option(BUILD_EXAMPLES "Build Examples" ON)
option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND})
option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS})
+option(BUILD_TESTS "Build tests (run tests with make test)" ON)
if (WIN32 AND NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "The rabbitmq-c library cannot be built as a static library on Win32. Set BUILD_SHARED_LIBS=ON to get around this.")
@@ -83,6 +84,11 @@ if (BUILD_TOOLS)
endif ()
endif ()
+if (BUILD_TESTS)
+ enable_testing()
+ add_subdirectory(tests)
+endif (BUILD_TESTS)
+
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..93ccb9a
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,10 @@
+include_directories(${LIBRABBITMQ_INCLUDE_DIRS})
+
+add_executable(test_parse_url test_parse_url.c)
+target_link_libraries(test_parse_url rabbitmq)
+add_test(parse_url test_parse_url)
+
+add_executable(test_tables test_tables.c)
+target_link_libraries(test_tables rabbitmq)
+add_test(tables test_tables)
+configure_file(test_tables.expected ${CMAKE_CURRENT_BINARY_DIR}/tests/test_tables.expected COPY_ONLY)
diff --git a/tests/test_tables.c b/tests/test_tables.c
index e4b0f43..659db53 100644
--- a/tests/test_tables.c
+++ b/tests/test_tables.c
@@ -446,7 +446,7 @@ int main(void)
test_dump_value(out);
if (srcdir == NULL)
- srcdir = "tests";
+ srcdir = ".";
expected_path = malloc(strlen(srcdir) + strlen(expected_file_name) + 2);
sprintf(expected_path, "%s/%s", srcdir, expected_file_name);