diff options
Diffstat (limited to 'TAO/tests/Bug_1482_Regression')
| -rwxr-xr-x | TAO/tests/Bug_1482_Regression/run_test.pl | 2 | ||||
| -rw-r--r-- | TAO/tests/Bug_1482_Regression/server.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tests/Bug_1482_Regression/run_test.pl b/TAO/tests/Bug_1482_Regression/run_test.pl index b245db7afdb..a508ef3ab05 100755 --- a/TAO/tests/Bug_1482_Regression/run_test.pl +++ b/TAO/tests/Bug_1482_Regression/run_test.pl @@ -116,7 +116,7 @@ while($elapsed < $max_running_time) { sleep (90); $server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); - if ($server_status != 0) { + if ($server_status < 0) { print STDERR "ERROR: server returned $server_status\n"; $CL1->Kill (); $CL1->TimedWait (1); $CL2->Kill (); $CL2->TimedWait (1); diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index 982e9a5e462..87d6842dbd1 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -52,18 +52,18 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Panic: nil RootPOA\n"), - 1); + -1); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) - return 1; + return -1; Hello *hello_impl; ACE_NEW_RETURN (hello_impl, Hello (orb.in ()), - 1); + -1); PortableServer::ServantBase_var owner_transfer(hello_impl); PortableServer::ObjectId_var id = @@ -83,7 +83,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", ior_output_file), - 1); + -1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); @@ -100,7 +100,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); - return 1; + return -1; } return 0; |