diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-10-19 15:26:55 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-10-19 15:26:55 +0000 |
| commit | c6372d43d72a8a14afa29d5e1d872dd8129c1f13 (patch) | |
| tree | 7784985c11201155b7e180a88c9bcc9e8353e251 /TAO/tests | |
| parent | 3b9397e87c4e4f60c5f8cad5938bf3ea05e1a341 (diff) | |
| download | ATCD-c6372d43d72a8a14afa29d5e1d872dd8129c1f13.tar.gz | |
ChangeLogTag:Tue Oct 19 10:24:02 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tests')
| -rwxr-xr-x | TAO/tests/DSI_Gateway/run_test.pl | 9 | ||||
| -rw-r--r-- | TAO/tests/DSI_Gateway/test_dsi.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/TAO/tests/DSI_Gateway/run_test.pl b/TAO/tests/DSI_Gateway/run_test.pl index d2b21f51186..7823a636e0d 100755 --- a/TAO/tests/DSI_Gateway/run_test.pl +++ b/TAO/tests/DSI_Gateway/run_test.pl @@ -9,6 +9,7 @@ unshift @INC, '../../../bin'; require ACEutils; $svfile = "server.ior"; +unlink $svfile; $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", " -o $svfile"); @@ -19,13 +20,14 @@ if (ACE::waitforfile_timed ($svfile, 5) == -1) { } $gwfile = "gateway.ior"; +unlink $gwfile; $GW = Process::Create ($EXEPREFIX."gateway$EXE_EXT ", " -k file://$svfile" . " -o $gwfile"); if (ACE::waitforfile_timed ($gwfile, 5) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); $SV->TimedWait (1); + $GW->Kill (); $GW->TimedWait (1); exit 1; } @@ -48,10 +50,11 @@ if ($server == -1) { $gateway = $GW->TimedWait (5); if ($server == -1) { print STDERR "ERROR: server timedout\n"; - $SV->Kill (); $SV->TimedWait (1); + $GW->Kill (); $GW->TimedWait (1); } -unlink $iorfile; +unlink $svfile; +unlink $gwfile; if ($server != 0 || $gateway != 0 diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index 75c52013dcf..5ed2528837c 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -116,7 +116,7 @@ DSI_Simple_Server::test_method_impl (CORBA::ServerRequest_ptr request, this->target_->_create_request (0, // ctx "test_method", list, - nv, + nv.in (), 0, // exception_list, 0, // context_list, target_request.inout (), |