Mon Mar 11 14:51:28 UTC 2013 Byron Harris <harrisb@ociweb.com>

2 files changed, 16 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5501e8c1a00..faa93202ab6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Mar 11 14:51:28 UTC 2013  Byron Harris  <harrisb@ociweb.com>
+
+        * orbsvcs/tests/FT_Naming/Replication/run_test.pl:
+
+          Added to wait time for spawn of client as it may
+          take longer than 15 seconds to run on some systems
+          such as a SPARC T1000.
+
+          Removed duplicate function definition causing prototype
+          mismatch warning from perl.
+
 Mon Mar 11 13:33:14 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
 
         * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp:
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
index b00a02d342e..c0573a0c4d8 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
@@ -61,18 +61,6 @@ my $test_primary_iorfile = $test->LocalFile ($primary_iorfile);
 
 $status = 0;
 
-sub clean_persistence_dir
-{
-    chdir $naming_persistence_dir;
-    opendir(THISDIR, ".");
-    @allfiles = grep(!/^\.\.?$/, readdir(THISDIR));
-    closedir(THISDIR);
-    foreach $tmp (@allfiles){
-        $test->DeleteFile ($tmp);
-    }
-    chdir "..";
-}
-
 print "INFO: Running the test in ", getcwd(), "\n";
 
 sub clean_persistence_dir($$)
@@ -174,7 +162,11 @@ print STDERR "Starting Client: $prog $args\n";
 
 $CL = $test->CreateProcess ("$prog", "$args");
 
-$client = $CL->SpawnWaitKill ($test->ProcessStartWaitInterval());
+# Some systems may take a very long time to process 100 objects.
+# For example, on a Solaris/SPARC system it was found that it took
+# 8 seconds to bind 100 objects compared to 0.08 seconds on a
+# Linux/Intel computer. So add to the wait time.
+$client = $CL->SpawnWaitKill ($test->ProcessStartWaitInterval() + 105);
 
 if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";