summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2011-09-20 06:25:13 +0000
committermsmit <msmit@remedy.nl>2011-09-20 06:25:13 +0000
commit01d2e284c6059039d7e821ab1d3685f1f2ee095e (patch)
treefafb6fb663b14c27b7ea3465529b722f9341cde3
parentf0cb616435e8d002c7be7f38548d159b7e70152c (diff)
downloadATCD-01d2e284c6059039d7e821ab1d3685f1f2ee095e.tar.gz
Tue Sep 20 06:27:42 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tests/Oneway_Send_Timeouts/run_test.pl: Fixed runtime issues
-rw-r--r--TAO/ChangeLog5
-rwxr-xr-xTAO/tests/Oneway_Send_Timeouts/run_test.pl5
2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 75e4f5251d4..798670842ba 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 20 06:27:42 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * tests/Oneway_Send_Timeouts/run_test.pl:
+ Fixed runtime issues
+
Fri Sep 16 12:01:35 UTC 2011 Marcel Smit <msmit@remedy.nl>
* DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl:
diff --git a/TAO/tests/Oneway_Send_Timeouts/run_test.pl b/TAO/tests/Oneway_Send_Timeouts/run_test.pl
index de9e43501f1..c9945d9b814 100755
--- a/TAO/tests/Oneway_Send_Timeouts/run_test.pl
+++ b/TAO/tests/Oneway_Send_Timeouts/run_test.pl
@@ -22,11 +22,11 @@ foreach $i (@ARGV) {
$debug_level = '10';
}
elsif ($i eq '-blocking') {
- $conf_file = $block_flush;
+ $conf_file = "block_flush.conf";
$flush_strategy = "BLOCKING";
}
elsif ($i eq '-reactive') {
- $conf_file = $reactive_flush;
+ $conf_file = "reactive_flush.conf";
$flush_strategy = "REACTIVE";
}
else {
@@ -39,7 +39,6 @@ $client_conf = $target->LocalFile ($conf_file);
if ($target->PutFile ($conf_file) == -1) {
print STDERR "ERROR: cannot set file <$client_conf>\n";
- $SV->Kill (); $SV->TimedWait (1);
exit 1;
}