diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-07-01 10:35:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-07-01 10:35:09 +0000 |
| commit | f1563fa702fa3ca03619ca1a4728dcf928de6474 (patch) | |
| tree | d36a9b3c07ff226a4c921a62e8b7c3b4ce8a811e | |
| parent | 8393c02ebaa509a755a40886b63b3499b4b082a7 (diff) | |
| download | ATCD-f1563fa702fa3ca03619ca1a4728dcf928de6474.tar.gz | |
Thu Jul 1 10:32:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/tests/Parsing/run_test.pl:
Print a message when a test succeeded
* DAnCE/tests/Parsing/test.cpp:
Explicitly catch Config_Error, that exception is now passed through
to this test. Also initialize the DAnCE Logger so that we can get
more output during manual testing
| -rw-r--r-- | CIAO/ChangeLog | 12 | ||||
| -rwxr-xr-x | CIAO/DAnCE/tests/Parsing/run_test.pl | 7 | ||||
| -rw-r--r-- | CIAO/DAnCE/tests/Parsing/test.cpp | 15 |
3 files changed, 31 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c2dd578b8fd..2320831a295 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Jul 1 10:32:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/tests/Parsing/run_test.pl: + Print a message when a test succeeded + + * DAnCE/tests/Parsing/test.cpp: + Explicitly catch Config_Error, that exception is now passed through + to this test. Also initialize the DAnCE Logger so that we can get + more output during manual testing + Thu Jul 1 09:02:28 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: @@ -5,7 +15,7 @@ Thu Jul 1 09:02:28 UTC 2010 Marcel Smit <msmit@remedy.nl> Thu Jul 1 08:57:21 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> - *bin/ciao_tests.lst + * bin/ciao_tests.lst: Add AMI4CCM tutorial to list. Thu Jul 1 08:37:21 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/CIAO/DAnCE/tests/Parsing/run_test.pl b/CIAO/DAnCE/tests/Parsing/run_test.pl index 9833e55d04c..de401921573 100755 --- a/CIAO/DAnCE/tests/Parsing/run_test.pl +++ b/CIAO/DAnCE/tests/Parsing/run_test.pl @@ -42,7 +42,7 @@ open (STDERR, ">&STDOUT"); $APP = $tg->CreateProcess ("./Parsing", "$file"); $retval = $APP->SpawnWaitKill ($tg->ProcessStartWaitInterval ()); $status = $status + $retval; - + open (STDOUT, ">&OLDOUT"); open (STDERR, ">&OLDERR"); @@ -50,8 +50,11 @@ open (STDERR, ">&OLDERR"); print STDERR "ERROR: Parsing returned $retval for file\n"; $status = 1; } + else { + print STDERR "Test succeeded\n"; + } - sleep (1); + sleep (1); } exit $status; diff --git a/CIAO/DAnCE/tests/Parsing/test.cpp b/CIAO/DAnCE/tests/Parsing/test.cpp index 0bcb24edae6..a4eb144eb4a 100644 --- a/CIAO/DAnCE/tests/Parsing/test.cpp +++ b/CIAO/DAnCE/tests/Parsing/test.cpp @@ -8,8 +8,10 @@ #include "DAnCE/Deployment/Deployment_NodeManagerC.h" #include "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h" #include "DAnCE/Logger/Log_Macros.h" +#include "DAnCE/Logger/Logger_Service.h" #include "Config_Handlers/DnC_Dump.h" #include "Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/Common.h" int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { @@ -17,6 +19,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) try { + DAnCE::Logger_Service + *dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger"); + + if (dlf) + { + dlf->init (argc, argv); + } + if (argc < 1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Incorrect count of arguments. Path to deployment plan has not been specified.\n"))); @@ -35,6 +45,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) return 1; } } + catch (const CIAO::Config_Handlers::Config_Error &ex) + { + DANCE_ERROR (1, (LM_ERROR, "Caught config error while parsing XML into IDL: %C:%C\n", + ex.name_.c_str (), ex.error_.c_str ())); + } catch (...) { ACE_ERROR ((LM_ERROR, "ERROR: Unexpected exception caught while parsing plan <%C>\n", |