ChangeLogTag:Wed May 26 21:40:34 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

3 files changed, 22 insertions, 21 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index fd49af4e915..6e87920f5eb 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -50,8 +50,7 @@ server ();
 sleep $sleeptime;
 
 client ();
-sleep $sleeptime;
-
-$NS->Kill ();
-$SV->Kill ();
+$CL->Wait ();
 
+$NS->Kill (); $NS->Wait ();
+$SV->Kill (); $SV->Wait ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index b37cd2b6179..db65f2c736c 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -37,16 +37,16 @@ sub airplane_test
 sub airplane_ir_test
 {
   $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT,
-                         "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0");
+                         "-ORBsvcconf implrepo.conf -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
   $SV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT,
-                         "-o $airplane_ior -i -r -ORBobjrefstyle url");
+                         "-o $airplane_ior -i -r");
 
   ACE::waitforfile ($airplane_ior);
 
-  system($EXEPREFIX."airplane_client -k file://$airplane_ior -ORBobjrefstyle url");
+  system($EXEPREFIX."airplane_client -k file://$airplane_ior");
 
   $IR->Kill (); $IR->Wait ();
 }
@@ -69,16 +69,16 @@ sub nestea_test
 sub nestea_ir_test
 {
   $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT,
-                         "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0");
+                         "-ORBsvcconf implrepo.conf -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
   $SV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT,
-                         "-o $nestea_ior -i -r -ORBobjrefstyle url");
+                         "-o $nestea_ior -i -r");
 
   ACE::waitforfile ($nestea_ior);
 
-  system($EXEPREFIX."nestea_client -k file://$nestea_ior -ORBobjrefstyle url");
+  system($EXEPREFIX."nestea_client -k file://$nestea_ior");
 
   $IR->Kill (); $IR->Wait ();
 }
@@ -86,27 +86,29 @@ sub nestea_ir_test
 sub both_ir_test
 {
   $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT,
-                         "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0");
+                         "-ORBsvcconf implrepo.conf -d 0");
 
   ACE::waitforfile ($implrepo_ior);
 
-  $ASV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT,
-                         "-o $nestea_ior -i -r -ORBobjrefstyle url");
+  $NSV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT,
+                         "-o $nestea_ior -i -r");
 
-  $NSV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT,
-                         "-o $airplane_ior -i -r -ORBobjrefstyle url");
+  $ASV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT,
+                         "-o $airplane_ior -i -r");
 
   ACE::waitforfile ($nestea_ior);
 
   $NCL = Process::Create ($EXEPREFIX."nestea_client".$Process::EXE_EXT,
-                          "-k file://$nestea_ior -ORBobjrefstyle url");
+                          "-k file://$nestea_ior");
 
   ACE::waitforfile ($airplane_ior);
 
-  system($EXEPREFIX."airplane_client -k file://$airplane_ior -ORBobjrefstyle url");
+  system($EXEPREFIX."airplane_client -k file://$airplane_ior");
 
-  $NCL->Kill (); $NCL->Kill ();
+  $NCL->Kill (); $NCL->Wait ();
   $IR->Kill (); $IR->Wait ();
+  $NSV->Wait ();
+  $ASV->Wait ();
 }
 
 
diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl
index 6e7183b63f9..12ee53d39d6 100755
--- a/TAO/orbsvcs/tests/Time/run_test.pl
+++ b/TAO/orbsvcs/tests/Time/run_test.pl
@@ -71,19 +71,19 @@ sub time_service_test_using_ir
 {
   $ir_dir = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR;
   $IR = Process::Create ($ir_dir."ImplRepo_Service".$Process::EXE_EXT,
-                         "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 1");
+                         "-ORBsvcconf implrepo.conf -d 1");
 
   ACE::waitforfile ($implrepo_ior);
 
   $SV1 = Process::Create ($time_dir."server".$Process::EXE_EXT,
-                         "-o $server_ior -i -r -ORBobjrefstyle url");
+                         "-o $server_ior -i -r");
 
   ACE::waitforfile ($server_ior);
 
   sleep 10;
 
   $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT,
-                          "-f $server_ior -o clerk_ior -ORBobjrefstyle url");
+                          "-f $server_ior -o clerk_ior");
 
   sleep 10;