summaryrefslogtreecommitdiff
path: root/CIAO/connectors/dds4ccm/tests/PSLDeadline
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/PSLDeadline')
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc3
-rw-r--r--CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp4
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl4
3 files changed, 5 insertions, 6 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
index ea3bdebc233..99ffa6c0cd4 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
@@ -5,12 +5,11 @@ project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_
dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL
libout = ../lib
- idlflags += -SS -Sci \
+ idlflags += -SS -Gxhst -Sci \
-Wb,stub_export_macro=PSL_DEADLINETEST_BASE_STUB_Export \
-Wb,stub_export_include=PSL_DeadlineTest_Base_stub_export.h
IDL_Files {
- idlflags += -Gxhst
PSL_DeadlineTest_Base.idl
}
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
index 2a776cbfa23..b3c1c12b13e 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
@@ -10,8 +10,8 @@
#include "ciao/Logger/Log_Macros.h"
#include "tao/ORB_Core.h"
#include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/TimeUtilities.h"
+#include "dds4ccm/impl/ndds/Utils.h"
+#include "dds4ccm/impl/ndds/TimeUtilities.h"
namespace CIAO_PSL_DeadlineTest_Receiver_Impl
{
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
index 4ea0f211542..edfa27e2a1f 100755
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
@@ -223,10 +223,10 @@ sleep (20);
# Invoke executor - stop the application -.
print "Invoking executor - stop the application -\n";
-print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n";
+print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n";
$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
- "-k file://$ior_emfile -x $cdp_file -s");
+ "-k file://$ior_emfile -x $cdp_file -q");
$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
if ($pl_status != 0) {