Wed Apr 23 14:08:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 18 insertions, 19 deletions

diff --git a/TAO/tests/Bug_2494_Regression/run_test.pl b/TAO/tests/Bug_2494_Regression/run_test.pl
index 4f3cd5cc56e..26d3f9ceaef 100755
--- a/TAO/tests/Bug_2494_Regression/run_test.pl
+++ b/TAO/tests/Bug_2494_Regression/run_test.pl
@@ -27,7 +27,12 @@ else {
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -n $cli_threads");
 $CLS = new PerlACE::Process ("client", "-k file://$iorfile -x");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile,
                         $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/tests/CSD_Collocation/CSD_Collocation.mpc b/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
index ac31348ee28..1d841625924 100644
--- a/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
+++ b/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project : taoserver, taoidldefaults, strategies, csd_threadpool, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
-
   idlflags += -Gd -St -Sa
   exename   = Collocation
 }
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
index 82635d2e616..5b33e74aacf 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h
@@ -52,15 +52,12 @@ public:
   virtual ~IBM1047_ISO8859 (void);
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
-  virtual ACE_CDR::Boolean read_char (ACE_InputCDR &,
-                                      ACE_CDR::Char &);
-  virtual ACE_CDR::Boolean read_string (ACE_InputCDR &,
-                                        ACE_CDR::Char *&);
+  virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, ACE_CDR::Char &);
+  virtual ACE_CDR::Boolean read_string (ACE_InputCDR &, ACE_CDR::Char *&);
   virtual ACE_CDR::Boolean read_char_array (ACE_InputCDR &,
                                             ACE_CDR::Char *,
                                             ACE_CDR::ULong);
-  virtual ACE_CDR::Boolean write_char (ACE_OutputCDR &,
-                                       ACE_CDR::Char);
+  virtual ACE_CDR::Boolean write_char (ACE_OutputCDR &, ACE_CDR::Char);
   virtual ACE_CDR::Boolean write_string (ACE_OutputCDR &,
                                          ACE_CDR::ULong,
                                          const ACE_CDR::Char *);
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
index 49184d3cdb0..cf09e725ce9 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h
@@ -51,15 +51,12 @@ public:
   virtual ~WIBM1047_ISO8859 (void);
 
   // = Documented in $ACE_ROOT/ace/CDR_Stream.h
-  virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &,
-                                      ACE_CDR::WChar &);
-  virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR &,
-                                        ACE_CDR::WChar *&);
+  virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &, ACE_CDR::WChar &);
+  virtual ACE_CDR::Boolean read_wstring (ACE_InputCDR &, ACE_CDR::WChar *&);
   virtual ACE_CDR::Boolean read_wchar_array (ACE_InputCDR &,
                                             ACE_CDR::WChar *,
                                             ACE_CDR::ULong);
-  virtual ACE_CDR::Boolean write_wchar (ACE_OutputCDR &,
-                                       ACE_CDR::WChar);
+  virtual ACE_CDR::Boolean write_wchar (ACE_OutputCDR &, ACE_CDR::WChar);
   virtual ACE_CDR::Boolean write_wstring (ACE_OutputCDR &,
                                          ACE_CDR::ULong,
                                          const ACE_CDR::WChar *);
diff --git a/TAO/tests/OBV/Forward/run_test.pl b/TAO/tests/OBV/Forward/run_test.pl
index b91259ec509..d65cbbd0234 100755
--- a/TAO/tests/OBV/Forward/run_test.pl
+++ b/TAO/tests/OBV/Forward/run_test.pl
@@ -26,7 +26,7 @@ if (PerlACE::waitforfile_timed ($iorfile,
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); $SV->TimedWait (1);
     exit 1;
-} 
+}
 
 $client = $CL->SpawnWaitKill (300);
 
@@ -35,7 +35,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (10);
+$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_shutdown);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
index d9dffab2446..e1b42951a19 100755
--- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
@@ -9,12 +9,13 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$file = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$file = PerlACE::LocalFile ("$iorbase");
 
 unlink $file;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $file");
@@ -38,7 +39,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";