fly/flightgear
1
0
Fork 0
Code Activity

Make Swift tests conditional on Swift support

Browse source
This commit is contained in:
James Turner 2022-11-28 15:12:44 +00:00
parent 4f01ddb1cc
commit 82dbef0c12
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test_suite/unit_tests/Network/CMakeLists.txt
View file

@ -1,14 +1,28 @@
if (ENABLE_SWIFT)
set(SWIFT_TESTS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftService.cxx
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftAircraftManager.cxx
)
set(SWIFT_TESTS_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftService.hxx
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftAircraftManager.hxx
)
endif()
set(TESTSUITE_SOURCES set(TESTSUITE_SOURCES
${TESTSUITE_SOURCES} ${TESTSUITE_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx ${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftService.cxx ${SWIFT_TESTS_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftAircraftManager.cxx
PARENT_SCOPE PARENT_SCOPE
) )
set(TESTSUITE_HEADERS set(TESTSUITE_HEADERS
${TESTSUITE_HEADERS} ${TESTSUITE_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftService.hxx ${SWIFT_TESTS_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/test_swiftAircraftManager.hxx
PARENT_SCOPE PARENT_SCOPE
) )

6
test_suite/unit_tests/Network/TestSuite.cxx
View file

@ -3,9 +3,15 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#include "config.h"
#if defined(ENABLE_SWIFT)
#include "test_swiftAircraftManager.hxx" #include "test_swiftAircraftManager.hxx"
#include "test_swiftService.hxx" #include "test_swiftService.hxx"
// Set up the unit tests. // Set up the unit tests.
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SwiftAircraftManagerTest, "Unit tests"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SwiftAircraftManagerTest, "Unit tests");
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SwiftServiceTest, "Unit tests"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SwiftServiceTest, "Unit tests");
#endif