ChangeLogTag:Thu Jul 1 12:37:01 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

6 files changed, 31 insertions, 5 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 705bd192bce..5788e2a16f9 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -4,6 +4,21 @@ Thu Jul  1 12:37:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 	  Fixed interpretive demarshaling of object references inside
 	  unions, this was breaking Param_Test for big_union using DII.
 
+	* tests/Multiple_Inheritance/Multiple_Inheritance_i.h:
+	* tests/Multiple_Inheritance/server.cpp:
+	  This test crashed on Sun/CC 5.0 because there was no explicit
+	  constructor, the compiler generated constructor was broken.
+
+	* orbsvcs/tests/EC_Throughput/run_test.pl:
+	  Fine tune the test timeout.
+
+	* tests/Param_Test/run_test.pl:
+	  The test was falling off the end without an explicit exit
+	  status.
+
+	* orbsvcs/tests/Property/run_test.pl:
+	  Remove the IOR files before waiting for it
+
 Thu Jul 01 00:45:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
 	* examples/Simulator/DOVEBrowser/Makefile: changed location
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index 7f22ca966ee..950053d6afd 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -68,7 +68,7 @@ $S = Process::Create ($EXEPREFIX."ECT_Supplier".$EXE_EXT,
 		      " -ORBNameServiceIOR file://$ns_ior "
 		      . " -s 1 -u 10000 -n 1 -t 0");
 
-if ($S->TimedWait (60) == -1) {
+if ($S->TimedWait (120) == -1) {
   print STDERR "ERROR: supplier timedout\n";
   $S->Kill (); $S->TimedWait (1);
   $C->Kill (); $C->TimedWait (1);
@@ -100,5 +100,4 @@ $NS->Terminate (); if ($NS->TimedWait (5) == -1) {
 
 unlink $ns_ior;
 
-# @@ Capture the errors from the processes.
 exit 0;
diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index 1d1d651a5a1..23fbe876458 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -22,7 +22,9 @@ sub name_server
 {
     my $args = " -o $nsior";
     my $prog = 
-    print ("\nNaming_Service: $args\n");
+      print ("\nNaming_Service: $args\n");
+
+    unlink $nsior;
     $NS = Process::Create ("..".$DIR_SEPARATOR
 			   ."..".$DIR_SEPARATOR
 			   ."Naming_Service".$DIR_SEPARATOR
@@ -77,4 +79,3 @@ $NS->Terminate (); if ($NS->TimedWait (5) == -1) {
 }
 
 exit $status;
-
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index dcdcd2eb342..8566d395413 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -7,6 +7,8 @@ ACE_RCSID(Multiple_Inheritance, Multiple_Inheritance_i, "$Id$")
 class Multiple_Inheritance_i : public POA_D
 {
 public:
+  Multiple_Inheritance_i (void);
+
   virtual CORBA::String method1 (CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index 8c4ff8e78c6..c328a07e42d 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -8,6 +8,13 @@ ACE_RCSID(Multiple_Inheritance, server, "$Id$")
 
 static char *ior_output_file = 0;
 
+Multiple_Inheritance_i::Multiple_Inheritance_i (void)
+{
+  // Sun/CC 5.0 crashes if there is no explicit default
+  // constructor
+  // Default constructor, do nothin..
+}
+
 int
 parse_args (int argc, char **argv)
 {
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 7b41a9f3a63..a234def7fb9 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -83,7 +83,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
       print "-h                  -- prints this information\n";
       print "-t type             -- runs only one type of param test\n";
       print "-i (dii|sii)        -- Changes the type of invocation\n";
-      exit;
+      exit 0;
     }
     if ($ARGV[$i] eq "-n")
     {
@@ -133,3 +133,5 @@ foreach $type (@types) {
 }
 
 unlink $iorfile;
+
+exit 0;