[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/HLA_TestsSuite HLATestsSuiteTools....
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] applications/HLA_TestsSuite HLATestsSuiteTools.... |
|
Date: |
Wed, 02 Jun 2010 09:15:35 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Eric NOULARD <erk> 10/06/02 09:15:35
Modified files:
HLA_TestsSuite : HLATestsSuiteTools.cmake CMakeLists.txt
Log message:
Merge 1516 and non 1516 test macros in order to ease maintenance.
HLA1516 is now an option of the
HLATestsSuite_ADD_TEST macro.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake?cvsroot=certi&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/CMakeLists.txt?cvsroot=certi&r1=1.39&r2=1.40
Patches:
Index: HLATestsSuiteTools.cmake
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/HLATestsSuiteTools.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- HLATestsSuiteTools.cmake 2 Jun 2010 08:32:08 -0000 1.10
+++ HLATestsSuiteTools.cmake 2 Jun 2010 09:15:35 -0000 1.11
@@ -45,8 +45,33 @@
SET(${prefix}_${current_arg_name} ${current_arg_list})
ENDMACRO(PARSE_ARGUMENTS)
+#
+# HLATestsSuite_ADD_TEST may be used to ease the build and run of HLA Tests.
+#
+# Usage:
+# HLATestsSuite_ADD_TEST(<testname>
+# FED_FILE <fed file list>
+# SOURCE_FILES <source files list>
+# DTEST_SCRIPT <script>
+# COMMENTS "a comment string"
+# MORELIBS "some libraries the test should be linked
with"
+#
+# All options but the <testname> are optional.
+# FED_FILE will be installed in share/federations
+# SOURCES_FILES will be compiled into an executable whose name is <testname>
+# the executable will be automatically linked with RTI
libraries.
+# DTEST_SCRIPTS is the list of actual test drivers that will be passed to
ctest
+# the script will be called with argument
+# --federate=${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}
+# There will be one ctest test for each provided script.
+# COMMENTS may be any helpful comment
+# MORELIBS may be used to specify additional libraries (besides RTI libs)
+#
+# VERBOSE the macro will print some infos when run.
+# HLA1516 use IEEE-1516 libs instead of default HLA1.3 libs.
+#
MACRO(HLATestsSuite_ADD_TEST)
- PARSE_ARGUMENTS(HLATSTools
"FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS;MORELIBS" "VERBOSE" ${ARGN})
+ PARSE_ARGUMENTS(HLATSTools
"FED_FILE;SOURCE_FILES;DTEST_SCRIPT;COMMENTS;MORELIBS" "VERBOSE;HLA1516"
${ARGN})
CAR(TESTNAME ${HLATSTools_DEFAULT_ARGS})
MESSAGE(STATUS "Configuring HLA Test: ${TESTNAME}")
@@ -56,11 +81,21 @@
MESSAGE(STATUS " DTEST_SCRIPT = ${HLATSTools_DTEST_SCRIPT}")
MESSAGE(STATUS " COMMENTS = ${HLATSTools_COMMENTS}")
MESSAGE(STATUS " MORELIBS = ${HLATSTools_MORELIBS}")
+ IF(HLATSTools_HLA1516)
+ MESSAGE(STATUS " -> Will be linked with IEEE-1516 libs ")
+ ELSE(HLATSTools_HLA1516)
+ MESSAGE(STATUS " -> Will be linked with HLA 1.3 libs ")
+ ENDIF(HLATSTools_HLA1516)
ENDIF(HLATSTools_VERBOSE)
+
IF (HLATSTools_SOURCE_FILES)
ADD_EXECUTABLE(${TESTNAME} ${HLATSTools_SOURCE_FILES})
+ IF(HLATSTools_HLA1516)
+ TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI1516_LIBRARIES}
${HLATSTools_MORELIBS})
+ ELSE(HLATSTools_HLA1516)
TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI_LIBRARIES}
${HLATSTools_MORELIBS})
+ ENDIF(HLATSTools_HLA1516)
INSTALL(TARGETS ${TESTNAME} RUNTIME DESTINATION bin)
ENDIF(HLATSTools_SOURCE_FILES)
@@ -81,40 +116,3 @@
ENDIF(HLATSTools_DTEST_SCRIPT)
ENDMACRO(HLATestsSuite_ADD_TEST)
-
-MACRO(HLATestsSuite_ADD_TEST1516)
- 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)
- MESSAGE(STATUS " FED_FILE = ${HLATSTools_FED_FILE}")
- 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)
-
- IF (HLATSTools_SOURCE_FILES)
- ADD_EXECUTABLE(${TESTNAME} ${HLATSTools_SOURCE_FILES})
- TARGET_LINK_LIBRARIES (${TESTNAME} ${RTI1516_LIBRARIES}
${HLATSTools_MORELIBS})
- INSTALL(TARGETS ${TESTNAME} RUNTIME DESTINATION bin)
- ENDIF(HLATSTools_SOURCE_FILES)
-
- IF (HLATSTools_FED_FILE)
- INSTALL(FILES ${HLATSTools_FED_FILE} DESTINATION share/federations)
- ENDIF (HLATSTools_FED_FILE)
-
- IF(HLATSTools_DTEST_SCRIPT)
- 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_TEST1516)
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/CMakeLists.txt,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- CMakeLists.txt 2 Jun 2010 08:30:40 -0000 1.39
+++ CMakeLists.txt 2 Jun 2010 09:15:35 -0000 1.40
@@ -175,10 +175,11 @@
#########################################################################
# ADD TEST INTERACTIVE FEDERATE 1516
#########################################################################
-HLATestsSuite_ADD_TEST1516(Interactive_Federate1516
+HLATestsSuite_ADD_TEST(Interactive_Federate1516
FED_FILE Interactive_Federation.fed 01.xml
Certi-Test-02.xml
SOURCE_FILES Interactive_Federate1516.cc
- COMMENTS "A multi-purpose test interactive Federate
1516")
+ COMMENTS "A multi-purpose test interactive Federate 1516"
+ HLA1516)
#########################################################################
# ADD TEST Notification SWITCH FEDERATE
@@ -201,36 +202,43 @@
#########################################################################
# IEEE-1516 unit and integration tests
#########################################################################
-HLATestsSuite_ADD_TEST1516(01-FederationExecutionTest
+HLATestsSuite_ADD_TEST(01-FederationExecutionTest
FED_FILE 01.xml 01.fed
SOURCE_FILES 01-FederationExecutionTest.cc
01-FederationExecutionTest.hh ReturnCodes.hh
- COMMENTS "01-FederationExecutionTest (1516)")
+ COMMENTS "01-FederationExecutionTest (1516)"
+ HLA1516)
-HLATestsSuite_ADD_TEST1516(02-HandlesAndNamesTest
+HLATestsSuite_ADD_TEST(02-HandlesAndNamesTest
FED_FILE Certi-Test-02.xml
SOURCE_FILES 02-HandlesAndNamesTest.cc
02-HandlesAndNamesTest.hh ReturnCodes.hh
- COMMENTS "02-HandlesAndNamesTest (1516)")
+ COMMENTS "02-HandlesAndNamesTest (1516)"
+ HLA1516)
-HLATestsSuite_ADD_TEST1516(03-PublishingTest
+HLATestsSuite_ADD_TEST(03-PublishingTest
FED_FILE Certi-Test-03.xml
SOURCE_FILES 03-PublishingTest.cc 03-PublishingTest.hh
ReturnCodes.hh
- COMMENTS "03-PublishingTest (1516)")
+ COMMENTS "03-PublishingTest (1516)"
+ HLA1516)
-HLATestsSuite_ADD_TEST1516(04-NameReservation
+HLATestsSuite_ADD_TEST(04-NameReservation
FED_FILE Certi-Test-04.xml
SOURCE_FILES 04-NameReservation.cc
04-NameReservation.hh ReturnCodes.hh
- COMMENTS "04-NameReservation (1516)")
+ COMMENTS "04-NameReservation (1516)"
+ HLA1516)
-HLATestsSuite_ADD_TEST1516(05-ObjectManagementTest
+HLATestsSuite_ADD_TEST(05-ObjectManagementTest
SOURCE_FILES 05-ObjectManagementTest.cc
05-ObjectManagementTest.hh ReturnCodes.hh
- COMMENTS "05-ObjectManagementTest (1516)")
+ COMMENTS "05-ObjectManagementTest (1516)"
+ HLA1516)
-HLATestsSuite_ADD_TEST1516(05-ObjectManagementCallbackTest
+HLATestsSuite_ADD_TEST(05-ObjectManagementCallbackTest
SOURCE_FILES 05-ObjectManagementCallbackTest.cc
05-ObjectManagementCallbackTest.hh ReturnCodes.hh
- COMMENTS "05-ObjectManagementCallbackTest (1516)")
+ COMMENTS "05-ObjectManagementCallbackTest (1516)"
+ HLA1516)
-HLATestsSuite_ADD_TEST1516(06-TimeEncodingTest
+HLATestsSuite_ADD_TEST(06-TimeEncodingTest
SOURCE_FILES 06-TimeEncodingTest.cc
06-TimeEncodingTest.hh ReturnCodes.hh
- COMMENTS "06-TimeEncodingTest (1516)")
+ COMMENTS "06-TimeEncodingTest (1516)"
+ HLA1516)
MESSAGE(STATUS "*** ${CMAKE_PROJECT_NAME} has been successfully configured
***")