Fixed up IR_Helper, added goodbye messages, using tao_ir in the testing.

6 files changed, 21 insertions, 23 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
index 5438c83ad83..d14fa8e86cd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
@@ -14,7 +14,7 @@ class ServerObject_i: public POA_ImplementationRepository::ServerObject
   //    registered server.
 {
 public:
-  ServerObject_i (int debug = 0) : debug_ (debug) {}
+  ServerObject_i (CORBA::ORB_ptr orb, int debug = 0) : orb_ (orb), debug_ (debug) {}
 
   virtual void ping (CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
     {
@@ -26,8 +26,12 @@ public:
     {
       if (this->debug_)
         ACE_DEBUG ((LM_DEBUG, "ServerObject_i::Shutdown\n"));
+ 
+      this->orb_->shutdown ();
     }
 private:
+  CORBA::ORB_var orb_;
+
   int debug_;
 };
 
@@ -37,7 +41,7 @@ IR_Helper::IR_Helper (char *server_name,
                       int debug)
   : name_ (ACE::strnew (server_name)),
     ir_addr_ (0),
-    server_object_ (new ServerObject_i (debug)),
+    server_object_ (new ServerObject_i (orb, debug)),
     implrepo_ (0),
     poa_ (poa),
     orb_ (orb),
diff --git a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.h b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.h
index a853291ed09..54ced8e4cf2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.h
+++ b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.h
@@ -65,8 +65,8 @@ private:
   // Object pointer to <server_object>
   
   ImplementationRepository::Administration *implrepo_;
-  PortableServer::POA_var poa_;
   CORBA::ORB_var orb_;
+  PortableServer::POA_var poa_;
   int debug_; 
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
index c60198ae4fd..e7ce084a55c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
@@ -63,18 +63,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Repository_Test"=.\Repository_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Global:

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 164daf342b9..5a22f6d9285 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -33,5 +33,7 @@ main (int argc, char *argv[])
       return -1;
     }
   ACE_ENDTRY;
+
+  ACE_DEBUG ((LM_DEBUG, "Paper Airplane Server says goodnight\n"));
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index e5673015ac2..5b3ecd937ab 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -33,5 +33,8 @@ main (int argc, char *argv[])
       return -1;
     }
   ACE_ENDTRY;
+
+  ACE_DEBUG ((LM_DEBUG, "Nestea Bookshelf Server says goodnight\n"));
+
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index c128c79c9a2..2044e9d9ee4 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -30,13 +30,12 @@ sub airplane_test
                     " -k file://$airplane_ior");
 
   $SV->Kill (); $SV->Wait ();
-  unlink $airplane_ior;
 }
 
 sub airplane_ir_test
 {
   $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, 
-                         "-ORBobjrefstyle url -d 0");
+                         "-ORBobjrefstyle url -o $implrepo_ior -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
@@ -49,6 +48,7 @@ sub airplane_ir_test
 
   system($EXEPREFIX."airplane_client -k file://$airplane_ior -ORBobjrefstyle url");
 
+  $SV->Kill (); $SV->Wait ();
   $IR->Kill (); $IR->Wait ();
 }
 
@@ -63,14 +63,12 @@ sub nestea_test
                     " -k file://$nestea_ior");
 
   $SV->Kill (); $SV->Wait ();
-
-  unlink $nestea_ior;
 }
 
 sub nestea_ir_test
 {
   $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, 
-                         "-ORBobjrefstyle url -d 0");
+                         "-ORBobjrefstyle url -o $implrepo_ior -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
@@ -83,13 +81,14 @@ sub nestea_ir_test
 
   system($EXEPREFIX."nestea_client -k file://$nestea_ior -ORBobjrefstyle url");
 
-#  $IR->Kill (); $IR->Wait ();
+  $SV->Kill (); $SV->Wait ();
+  $IR->Kill (); $IR->Wait ();
 }
 
 sub both_ir_test
 {
   $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, 
-                         "-ORBobjrefstyle url -d 0");
+                         "-ORBobjrefstyle url -o $implrepo_ior -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
@@ -111,6 +110,8 @@ sub both_ir_test
 
   system($EXEPREFIX."airplane_client -k file://$airplane_ior -ORBobjrefstyle url");
 
+  $ASV->Kill (); $ASV->Wait ();
+  $NSV->Kill (); $NSV->Wait ();
   $NCL->Kill (); $NCL->Kill ();
   $IR->Kill (); $IR->Wait ();
 }
@@ -127,7 +128,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
       print "run_test test\n";
       print "\n";
       print "test               -- Runs a specific test\n";
-      print "                      airplane, simple, or implrepo\n";
+      print "                      airplane, airplane_ir, nestea, nestea_ir, both_ir\n";
       exit;
     }
     if ($ARGV[$i] eq "airplane")