On Fri, May 20, 2011 at 12:47 AM, <astokes(a)fedoraproject.org> wrote:
From: Adam Stokes <astokes(a)fedoraproject.org>
---
matahari.spec | 1 +
src/CMakeLists.txt | 9 +------
src/tests/CMakeLists.txt | 12 ++++++++-
src/tests/mh_api_network_unittest.h | 47 -----------------------------------
4 files changed, 13 insertions(+), 56 deletions(-)
delete mode 100644 src/tests/mh_api_network_unittest.h
diff --git a/matahari.spec b/matahari.spec
index a96c91c..d3e3040 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -392,6 +392,7 @@ test "x%{buildroot}" != "x" && rm -rf
%{buildroot}
%{_includedir}/matahari.h
%{_datadir}/matahari/schema.xml
%{_datadir}/cmake/Modules/FindMatahari.cmake
+%{_datadir}/matahari/tests/*.h
Why would we want to publish the test headers?
%if %{with qmf}
%{_includedir}/matahari/mh_agent.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c9736c..1dfd143 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,13 +1,5 @@
#set(CMAKE_VERBOSE_MAKEFILE ON)
-find_package(CxxTest)
-if(CXXTEST_FOUND)
- include_directories(${CXXTEST_INCLUDE_DIR})
- ENABLE_TESTING()
- CXXTEST_ADD_TEST(mh_api_network_unittest mh_api_network_unittest.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/mh_api_network.h)
- target_link_libraries(mh_api_network_unittest mh_api_network_unittest)
-endif(CXXTEST_FOUND)
-
if(WIN32)
set(VARIANT "windows")
set(SUPPORT_TRACING 0)
@@ -150,6 +142,7 @@ add_subdirectory(host)
add_subdirectory(network)
add_subdirectory(service)
add_subdirectory(config)
+add_subdirectory(tests)
### Installation
install(FILES ${SCHEMAS} DESTINATION share/matahari)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 21bc609..99ae968 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,3 +1,13 @@
+set(CXXTEST_USE_PYTHON TRUE)
+find_package(CxxTest)
+if(CXXTEST_FOUND)
+ include_directories(${CXXTEST_INCLUDE_DIR})
+ ENABLE_TESTING()
+ CXXTEST_ADD_TEST(mh_api_network_unittest mh_api_network_unittest.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mh_api_network.h)
Naming changes as per previous mail.
+ target_link_libraries(mh_api_network_unittest mnetwork)
+ message(STATUS "Testing Found.")
+endif(CXXTEST_FOUND)
+
file(GLOB SRCS "*.cpp")
file(GLOB HEADERS "*.h")
-#install(FILES ${SRCS} ${HEADERS} DESTINATION share/matahari/tests)
+install(FILES ${SRCS} ${HEADERS} DESTINATION share/matahari/tests)
diff --git a/src/tests/mh_api_network_unittest.h b/src/tests/mh_api_network_unittest.h
deleted file mode 100644
index 9e69462..0000000
--- a/src/tests/mh_api_network_unittest.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __MH_API_NETWORK_UNITTEST_H
-#define __MH_API_NETWORK_UNITTEST_H
-#include <iostream>
-#include <string>
-#include <utility>
-#include <vector>
-#include <cstdlib>
-#include <cstdio>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <cxxtest/TestSuite.h>
-
-extern "C" {
-#include "matahari/network.h"
-#include "matahari/host.h"
-#include <sigar.h>
-#include <sigar_format.h>
-#include <glib.h>
-};
-
-using namespace std;
-
-class MhApiNetworkSuite : public CxxTest::TestSuite
-{
- public:
- void setUp (void)
- {
- // will be setup
- }
-
- void tearDown (void)
- {
- // teardown
-
- }
-
- void testListNetworkDevices(void)
- {
- GList *plist = NULL;
- GList *interface_list = NULL;
-
- interface_list = mh_network_get_interfaces();
- TS_ASSERT (!interface_list.empty());
- }
-};
-
-#endif
--
1.7.4.4
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari