diff options
| author | msmit <msmit@remedy.nl> | 2010-06-17 08:18:44 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-06-17 08:18:44 +0000 |
| commit | 17c31b3e2bfa4b32cb7a0e1568a5bd1a0d86c5a6 (patch) | |
| tree | 97b489300d5fdc9aba5c150b678157cdda83aa5d | |
| parent | 1ff71c20280bf9c3473a6c928039e8e75cadf6ed (diff) | |
| download | ATCD-17c31b3e2bfa4b32cb7a0e1568a5bd1a0d86c5a6.tar.gz | |
Thu Jun 17 08:15:26 UTC 2010 Marcel Smit <msmit@remedy.nl>
* bin/ciao_tests.lst:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/run_test.pl:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl:
Reorganized descriptors directory.
| -rw-r--r-- | CIAO/ChangeLog | 13 | ||||
| -rw-r--r-- | CIAO/bin/ciao_tests.lst | 2 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp (renamed from CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp) | 0 | ||||
| -rwxr-xr-x | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl (renamed from CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl) | 10 |
4 files changed, 19 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 193055742c0..a0546e10221 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Thu Jun 17 08:15:26 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/run_test.pl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl: + Reorganized descriptors directory. + Thu Jun 17 08:06:31 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ShapesControl_comp/ports/ShapesControl_obj.mpc: diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index 0c042dd24e5..67c81033145 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -115,7 +115,7 @@ TAO/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/descriptors TAO/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/GetComponent/State/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/GetComponent/Event/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS -TAO/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl: !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl: !ACE_FOR_TAO !ST NDDS diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp index 0fd5f699363..0fd5f699363 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl index 61d66169eb7..4558df0e65a 100755 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl @@ -42,23 +42,23 @@ $tg_exe_man = 0; $tg_executor = 0; $status = 0; -$cdp_file = "Plan.cdp"; +$cdp_file = "../descriptors/Plan.cdp"; sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; - $tg_naming->AddLibPath ('../lib'); + $tg_naming->AddLibPath ('../../lib'); # daemon for ($i = 0; $i < $nr_daemon; ++$i) { $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; - $tg_daemons[$i]->AddLibPath ('../lib'); + $tg_daemons[$i]->AddLibPath ('../../lib'); } # execution manager $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - $tg_exe_man->AddLibPath ('../lib'); + $tg_exe_man->AddLibPath ('../../lib'); # executor (plan_launcher) $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; - $tg_executor->AddLibPath ('../lib'); + $tg_executor->AddLibPath ('../../lib'); } sub init_ior_files { |