[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/HLA_TestsSuite CMakeLists.txt HLAT...
From: |
certi-cvs |
Subject: |
[certi-cvs] applications/HLA_TestsSuite CMakeLists.txt HLAT... |
Date: |
Thu, 15 Oct 2009 16:11:28 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Eric NOULARD <erk> 09/10/15 16:11:28
Modified files:
HLA_TestsSuite : CMakeLists.txt HLATestsSuiteTools.cmake
Log message:
Enhance HLATestsSuiteTools
* support for MORELIBS for test federates
which needs specific libraries.
* handle multiple dtest scripts for a single executable federate
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/CMakeLists.txt?cvsroot=certi&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake?cvsroot=certi&r1=1.7&r2=1.8
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/CMakeLists.txt,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- CMakeLists.txt 4 May 2009 08:41:30 -0000 1.32
+++ CMakeLists.txt 15 Oct 2009 16:11:28 -0000 1.33
@@ -75,6 +75,7 @@
FIND_PACKAGE(RTI REQUIRED)
INCLUDE_DIRECTORIES(${RTI_INCLUDE_DIR})
ADD_DEFINITIONS(${RTI_DEFINITIONS})
+find_library(LIBHLA HLA)
#########################################################################
# CPack specific Configuration
@@ -158,6 +159,7 @@
HLATestsSuite_ADD_TEST(test_TRTCCallbacks
FED_FILE test_TRTCCallbacks.fed
SOURCE_FILES test_TRTCCallbacks.cc
+ MORELIBS ${LIBHLA}
DTEST_SCRIPT dtest_test_TRTCCallbacks.py
COMMENTS "Test HLA TimeRegulating and TimeConstrained
Callbacks")
Index: HLATestsSuiteTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- HLATestsSuiteTools.cmake 20 Nov 2008 15:29:34 -0000 1.7
+++ HLATestsSuiteTools.cmake 15 Oct 2009 16:11:28 -0000 1.8
@@ -46,7 +46,7 @@
ENDMACRO(PARSE_ARGUMENTS)
MACRO(HLATestsSuite_ADD_TEST)
- PARSE_ARGUMENTS(HLATSTools "FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS"
"VERBOSE" ${ARGN})
+ PARSE_ARGUMENTS(HLATSTools
"FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS;MORELIBS" "VERBOSE" ${ARGN})
CAR(TESTNAME ${HLATSTools_DEFAULT_ARGS})
MESSAGE(STATUS "Configuring HLA Test: ${TESTNAME}")
IF (HLATSTools_VERBOSE)
@@ -54,15 +54,23 @@
MESSAGE(STATUS " SOURCE_FILES = ${HLATSTools_SOURCE_FILES}")
MESSAGE(STATUS " DTEST_SCRIPT = ${HLATSTools_DTEST_SCRIPT}")
MESSAGE(STATUS " COMMENTS = ${HLATSTools_COMMENTS}")
+ MESSAGE(STATUS " MORELIBS = ${HLATSTools_MORELIBS}")
ENDIF(HLATSTools_VERBOSE)
ADD_EXECUTABLE(${TESTNAME} ${HLATSTools_SOURCE_FILES})
- TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI_LIBRARIES})
+ TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI_LIBRARIES}
${HLATSTools_MORELIBS})
INSTALL(TARGETS ${TESTNAME}
RUNTIME DESTINATION bin)
INSTALL(FILES ${HLATSTools_FED_FILE}
DESTINATION share/federations)
IF(HLATSTools_DTEST_SCRIPT)
- CONFIGURE_FILE(${HLATSTools_DTEST_SCRIPT} ${HLATSTools_DTEST_SCRIPT}
COPYONLY)
- ADD_TEST(${TESTNAME} ${HLATSTools_DTEST_SCRIPT}
--federate=${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME})
+ SET(NUM 0)
+ foreach(DTEST_SCRIPT ${HLATSTools_DTEST_SCRIPT})
+ MATH(EXPR NUM '${NUM}+1')
+ IF (HLATSTools_VERBOSE)
+ MESSAGE(STATUS " Adding test ${TESTNAME}-${NUM} for test
script ${DTEST_SCRIPT}")
+ ENDIF(HLATSTools_VERBOSE)
+ CONFIGURE_FILE(${DTEST_SCRIPT} ${DTEST_SCRIPT} COPYONLY)
+ ADD_TEST(${TESTNAME}-${NUM} ${DTEST_SCRIPT}
--federate=${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME})
+ endforeach(DTEST_SCRIPT)
ENDIF(HLATSTools_DTEST_SCRIPT)
ENDMACRO(HLATestsSuite_ADD_TEST)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] applications/HLA_TestsSuite CMakeLists.txt HLAT...,
certi-cvs <=