See Mon Oct 26 14:22:18 1998 Matthew J Braun <mjb2@cec.wustl.edu>

8 files changed, 26 insertions, 30 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 9719f346cdb..c7855ac0690 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,15 @@
+Mon Oct 26 14:22:18 1998  Matthew J Braun  <mjb2@cec.wustl.edu>
+
+	* examples/POA/DSI/README
+	* examples/POA/DSI/run_test.pl
+	* examples/POA/DSI/server.cpp
+	* examples/POA/DSI/client.cpp
+	* tests/Multiple_Inheritance/run_test.pl
+	* tests/Multiple_Inheritance/server.cpp
+	* tests/Multiple_Inheritance/client.cpp
+	  Fixed command line arguments to conform to Irfan's
+	  specifications. 
+	
 Mon Oct 26 12:01:30 1998  David L. Levine  <levine@cs.wustl.edu>
 
 	* TAO_IDL/be/be_visitor_union/any_op_cs.cpp: 
diff --git a/TAO/examples/POA/DSI/README b/TAO/examples/POA/DSI/README
index 34a850ea3de..f2da382e968 100644
--- a/TAO/examples/POA/DSI/README
+++ b/TAO/examples/POA/DSI/README
@@ -1,5 +1,4 @@
 $Id$
 Note: If you run the test, and nothing happens, that's a good thing. This
 is more of an example than a test, and therefore is not very
-verbose.If you pass the [-d] argument to the server, it will print out 
-some generic debugging info (multiple [-d]'s alter the output).
+verbose.
diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index c3aed736899..aba09b9dcd4 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -27,7 +27,7 @@ static char *IOR_file = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:f:d");
+  ACE_Get_Opt get_opts (argc, argv, "k:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,10 +41,6 @@ parse_args (int argc, char **argv)
         IOR_file = get_opts.optarg;
         break;
 
-      case 'd':
-	TAO_debug_level++;
-	break; 
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl
index 77416e8c4b5..c2c60af69bd 100755
--- a/TAO/examples/POA/DSI/run_test.pl
+++ b/TAO/examples/POA/DSI/run_test.pl
@@ -8,11 +8,11 @@ unshift @INC, '../../../../bin';
 require ACEutils;
 
 $iorfile = "server.ior";
-$SV = Process::Create ("server$Process::EXE_EXT", " -o $iorfile");
+$SV = Process::Create ("server$Process::EXE_EXT", " -f $iorfile");
 
 ACE::waitforfile ($iorfile);
 
-$status  = system ("client$Process::EXE_EXT -k $iorfile");
+$status  = system ("client$Process::EXE_EXT -f $iorfile");
 
 $SV->Kill (); $SV->Wait ();
 
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 814b860c5b9..21271bc9e9e 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -33,11 +33,6 @@ parse_args (int argc, char **argv)
       case 'f':
         ior_output_file = get_opts.optarg;
         break;
-
-      case 'd':
-	TAO_debug_level++;
-	break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 84fb79c7829..c91e049c621 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -28,7 +28,7 @@ static char *ior_input_file = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:i:");
+  ACE_Get_Opt get_opts (argc, argv, "k:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,14 +37,13 @@ parse_args (int argc, char **argv)
       case 'k':
         ior = get_opts.optarg;
         break;
-      case 'i':
+      case 'f':
 	ior_input_file = get_opts.optarg;
 	break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "\nusage:  %s "
-			   "-d "
 			   "-i <ior_input_file> "
                            "-k IOR "
                            "\n",
diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl
index 51b78e537fc..ac0b3c94a33 100755
--- a/TAO/tests/Multiple_Inheritance/run_test.pl
+++ b/TAO/tests/Multiple_Inheritance/run_test.pl
@@ -8,11 +8,11 @@ unshift @INC, '../../../bin';
 require ACEutils;
 
 $iorfile = "server.ior";
-$SV = Process::Create ("server$Process::EXE_EXT", " -o $iorfile");
+$SV = Process::Create ("server$Process::EXE_EXT", " -f $iorfile");
 
 ACE::waitforfile ($iorfile);
 
-$status  = system ("client$Process::EXE_EXT -i $iorfile");
+$status  = system ("client$Process::EXE_EXT -f $iorfile");
 
 $SV->Kill (); $SV->Wait ();
 
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index 2a7232db67e..00a829cfc42 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -10,24 +10,20 @@ static char *ior_output_file = 0;
 int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "do:");
+  ACE_Get_Opt get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
-      case 'd':
-	TAO_debug_level++;
-        break;
-      case 'o':
+      case 'f':
 	ior_output_file = ACE_OS::strdup (get_opts.optarg);
 	break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-                           "-d "
-			   "-o <iorfile>"
+			   "-f <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -61,10 +57,9 @@ main (int argc, char **argv)
 					      TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG, "%s\n",
-		    ior.in ()));
-
+      ACE_DEBUG ((LM_DEBUG, "%s\n",
+                  ior.in ()));
+      
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
 	{