Fri Dec 11 12:27:25 UTC 2009 Denis Budko <denis.budko@remedy.nl>

        * orbsvcs/tests/Bug_2285_Regression/run_test2.pl:
        * orbsvcs/tests/Bug_2285_Regression/server2.cpp:
        * orbsvcs/tests/Notify/Ordering/run_test.pl:
        * orbsvcs/tests/Notify/MC/run_test.pl:
        * orbsvcs/tests/Notify/Discarding/run_test.pl:
        * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
        * orbsvcs/tests/ImplRepo/run_test.pl:
        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
        * orbsvcs/tests/Bug_2248_Regression/run_test.pl:
        * tests/AlternateIIOP/run_test.pl:
        * examples/Load_Balancing/run_test.pl:

          Tests are converted to use new test framework
          and added to fuzz build.

2 files changed, 6 insertions, 6 deletions

diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
index a9ede9d1dad..3f639ba1591 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl
@@ -153,14 +153,14 @@ if ($client_status != 0) {
 
 $server_status = $SV1->WaitKill ($server1->ProcessStopWaitInterval());
 
-if ($server_status != 0) {
+if ($server_status < 0) {
     print STDERR "ERROR: server 1 returned $server_status\n";
     $status = 1;
 }
 
 $server_status = $SV2->WaitKill ($server2->ProcessStopWaitInterval());
 
-if ($server_status != 0) {
+if ($server_status < 0) {
     print STDERR "ERROR: server 2 returned $server_status\n";
     $status = 1;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index ca7d5a28208..59feb7de5cb 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -67,14 +67,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
-        return 1;
+        return -1;
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
+                          -1);
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in ());
@@ -122,7 +122,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);
       }
@@ -150,7 +150,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Caught exception:");
-      return 1;
+      return -1;
     }
   return 0;
 }