summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-06-29 12:32:38 +0000
committermsmit <msmit@remedy.nl>2010-06-29 12:32:38 +0000
commit1aa2b6778e6968fd5a28a9a515643d3bee4f535f (patch)
treeaac06e257269ac1bf02f46b9f7cd27444d97723e
parent1d4ea2d6291c090aa2389fe1753aabf162f436d9 (diff)
downloadATCD-1aa2b6778e6968fd5a28a9a515643d3bee4f535f.tar.gz
Tue Jun 29 12:29:25 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl: Using the -q option on the plan launcher
-rw-r--r--CIAO/ChangeLog5
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl8
2 files changed, 6 insertions, 7 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7bb6036f78a..93356f7d843 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 29 12:29:25 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl:
+ Using the -q option on the plan launcher
+
Tue Jun 29 12:06:24 UTC 2010 Marcel Smit <msmit@remedy.nl>
* DAnCE/Plan_Launcher/Plan_Launcher.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
index 3fad3304cd9..8573ab71d66 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Deployments/run_test.pl
@@ -28,12 +28,6 @@ $ior_nsfile = 0;
$ior_embase = "EM.ior";
$ior_emfile = 0;
-#Redirect the screen output to the null device.
-open (OLDOUT, ">&STDOUT");
-open (STDOUT, ">" . File::Spec->devnull());
-open (OLDERR, ">&STDERR");
-open (STDERR, ">&STDOUT");
-
# Processes
$E = 0;
$EM = 0;
@@ -201,7 +195,7 @@ foreach $file (@files) {
# Invoke executor - start the application -.
print "Invoking executor - launch the application -\n";
$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
- "-x $file -k file://$ior_emfile");
+ "-x $file -k file://$ior_emfile -q");
$pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
if ($pl_status != 0) {
print "OK: dance_plan_launcher reported a problem <$pl_status>\n";