diff options
| author | msmit <msmit@remedy.nl> | 2012-11-23 12:54:23 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2012-11-23 12:54:23 +0000 |
| commit | 9bf0f94a9ef418313504b6b61e6b15bcf978a31e (patch) | |
| tree | 0eabca846926e993f6e143a1751a2a863eec51d4 | |
| parent | 89212ba6030a12f13f1d6d96110101e62398dec1 (diff) | |
| download | ATCD-9bf0f94a9ef418313504b6b61e6b15bcf978a31e.tar.gz | |
Fri Nov 23 12:53:17 UTC 2012 Marcel Smit <msmit@remedy.nl>
* tests/Bug_3769_Regression/Foo_exec.cpp:
Fixed fuzz and test.
* tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp:
Fixed fuzz.
| -rw-r--r-- | CIAO/ChangeLog | 12 | ||||
| -rw-r--r-- | CIAO/tests/Bug_3769_Regression/Foo_exec.cpp | 4 | ||||
| -rw-r--r-- | CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index a922aa214fa..6164b480d56 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,14 +1,22 @@ +Fri Nov 23 12:53:17 UTC 2012 Marcel Smit <msmit@remedy.nl> + + * tests/Bug_3769_Regression/Foo_exec.cpp: + Fixed fuzz and test. + + * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: + Fixed fuzz. + Fri Nov 23 10:56:41 UTC 2012 Marcel Smit <msmit@remedy.nl> * tests/Bug_3769_Regression/Foo_exec.cpp: - Minor layout change. + Minor layout change. * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: Added new attribute. * bin/ciao_tests.lst: * tests/Bug_3769_Regression/descriptors/run_test_cdr.pl: - New test: using CDR as input for the plan launcher. + New test: using CDR as input for the plan launcher. Fri Nov 23 10:28:23 UTC 2012 Marcel Smit <msmit@remedy.nl> diff --git a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp index 8c6ca2bc282..e2f62f983d6 100644 --- a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp +++ b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp @@ -538,15 +538,13 @@ namespace CIAO_Foo_Impl my_struct_struct.type)); error_found = true; } - if (my_struct_struct.struct_time.sec != 15) { ACE_ERROR ((LM_ERROR, "ERROR: my_struct_struct.struct_time.sec != 15, it is %d\n", my_struct_struct.struct_time.sec)); error_found = true; } - - if (my_struct_struct.struct_time.sec != 15) + if (my_struct_struct.struct_time.nanosec != 20) { ACE_ERROR ((LM_ERROR, "ERROR: my_struct_struct.struct_time.nanosec != 20, it is %d\n", my_struct_struct.struct_time.nanosec)); diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp b/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp index ab3eb7e8328..44b82e54a1b 100644 --- a/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp +++ b/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp @@ -619,7 +619,6 @@ </value> </configProperty> - </instance> <artifact xmi:id="_669DBD2E-E130-11DE-B472-00242C889DAA"> |