summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-10-31 13:31:52 +0000
committerMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-10-31 13:31:52 +0000
commite0f67379c0a96e8317d32f26b2c42c35edda7dd0 (patch)
tree1ca232590cb9f7873475d98216a5cecd107ea634
parent4a59ecca2628ad51f876a5b6456b3f82a030cc8b (diff)
downloadATCD-e0f67379c0a96e8317d32f26b2c42c35edda7dd0.tar.gz
Mon Oct 31 13:30:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* tests/Collocation/README: Explanation of the test
-rw-r--r--CIAO/ChangeLog.BRANCH4
-rw-r--r--CIAO/tests/Collocation/README25
2 files changed, 29 insertions, 0 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index 0f44cd54bd5..4ba6701aa53 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,7 @@
+Mon Oct 31 13:30:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
+ * tests/Collocation/README:
+ Explanation of the test
+
Mon Oct 31 13:19:15 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* tests/Collocation/Coll_Base/Base.idl:
* tests/Collocation/Coll_Base/Base.mpc:
diff --git a/CIAO/tests/Collocation/README b/CIAO/tests/Collocation/README
new file mode 100644
index 00000000000..9448e5facfc
--- /dev/null
+++ b/CIAO/tests/Collocation/README
@@ -0,0 +1,25 @@
+// $Id$
+
+This test is used to test collocation.
+
+CIAO has to be build with ccm_direct_collocation=1
+
+In order to make sure that indeed direct collocation is used, the test self
+is build with -Sp (see Base.mpc),so collocation thru_poa is disabled.
+
+The test runs with different CollocationStrategies, defined in the deploymentplans:
+- PlanAllOnOneNoTP ( Sender and Receiver same process) with -ORBCollocationStrategy thru_poa:
+ because thru_poa is disabled, we expect an internal exception.
+- PlanAllOnOne ( Sender and Receiver same process) with -ORBCollocationStrategy direct:
+ we expect collocation and because thru_poa is disabled, this must be direct collocation.
+- PlanAllOnOneBest ( Sender and Receiver same process) with -ORBCollocationStrategy best:
+ we expect collocation and because thru_poa is disabled, this must be direct collocation.
+- PlanAllOnOneNo ( Sender and Receiver same process) with -ORBCollocation no:
+ we expect no collocation.
+
+- PlanAllOnOneMore ( Sender and Receiver different process) with -ORBCollocationStrategy direct:
+ we expect no collocation, but a remote strategy because the Sender and Receiver are not in the same process.
+
+
+
+