[certi-cvs] applications/HLA_TestsSuite dtest_1516_01-Feder...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      14/03/05 09:47:22

Modified files:
        HLA_TestsSuite : dtest_1516_01-FederationExecutionTest.py 
                         CMakeLists.txt 

Log message:
        Update for 
         - new CERTI file layout, namelly libhla subdir
         - new exception print out

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/dtest_1516_01-FederationExecutionTest.py?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/HLA_TestsSuite/CMakeLists.txt?cvsroot=certi&r1=1.45&r2=1.46

Patches:
Index: dtest_1516_01-FederationExecutionTest.py
===================================================================
RCS file: 
/sources/certi/applications/HLA_TestsSuite/dtest_1516_01-FederationExecutionTest.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dtest_1516_01-FederationExecutionTest.py    22 Nov 2010 21:05:22 -0000      
1.1
+++ dtest_1516_01-FederationExecutionTest.py    5 Mar 2014 09:47:22 -0000       
1.2
@@ -106,11 +106,11 @@
 firstFederate.addRunStep("expectFromCommand",pattern="$")
 
 firstFederate.addRunStep("sendToCommand",string="\n")
-firstFederate.addRunStep("expectFromCommand",pattern="04E \(Pass: No 
federation to destroy\).*")
+firstFederate.addRunStep("expectFromCommand",pattern="04E .*: \(Pass: No 
federation to destroy\).*")
 firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"No 
federation to destroy")
 
 firstFederate.addRunStep("sendToCommand",string="\n")
-firstFederate.addRunStep("expectFromCommand",pattern="07E \(Pass: Could not 
join non-existent federation\).*")
+firstFederate.addRunStep("expectFromCommand",pattern="07E .*: \(Pass: Could 
not join non-existent federation\).*")
 firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"Could not 
join non-existent federation")
 
 firstFederate.addRunStep("sendToCommand",string="\n")
@@ -118,7 +118,7 @@
 firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"Created 
federation")
 firstFederate.addRunStep("expectFromCommand",pattern="11E Pass: Joined 
federation.*")
 firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"Joined 
federation")
-firstFederate.addRunStep("expectFromCommand",pattern="14E \(Pass: Could not 
destroy federation while still joined\).*")
+firstFederate.addRunStep("expectFromCommand",pattern="14E .*: \(Pass: Could 
not destroy federation while still joined\).*")
 firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"Could not 
destroy federation while still joined")
 firstFederate.addRunStep("expectFromCommand",pattern="16E Pass: Resigned from 
federation.*")
 firstFederate.addRunStep("ok",firstFederate.getFutureLastStepStatus,"Resigned 
from federation")

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/HLA_TestsSuite/CMakeLists.txt,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- CMakeLists.txt      30 Dec 2011 16:51:54 -0000      1.45
+++ CMakeLists.txt      5 Mar 2014 09:47:22 -0000       1.46
@@ -73,9 +73,21 @@
 # FIND RTI (CERTI, MAK, Pitch, ...)
 #########################################################################
 FIND_PACKAGE(RTI REQUIRED)
-INCLUDE_DIRECTORIES(${RTI_INCLUDE_DIR})
+include_directories(${RTI_INCLUDE_DIR} ${RTI1516_INCLUDE_DIR} 
${RTI_INCLUDE_DIR}/..)
 ADD_DEFINITIONS(${RTI_DEFINITIONS})
-find_library(LIBHLA NAMES HLA HLAd)
+
+find_library(LIBHLA
+  NAMES HLA HLAd
+  PATHS $ENV{CERTI_HOME}
+  PATH_SUFFIXES lib Debug Release
+  DOC "The libHLA Library")
+  
+find_path(LIBHLA_INCLUDE_DIR
+   NAMES libhla.hh HHLAtypesIEEE1516.hh
+   PATHS $ENV{CERTI_HOME}
+   PATH_SUFFIXES libhla)
+   
+include_directories(${LIBHLA_INCLUDE_DIR})
 
 #########################################################################
 # CPack specific Configuration