Fri Nov 27 10:12:19 UTC 2009 Denis Budko <denis.budko@remedy.nl>

        * tests/OctetSeq/run_test1.pl:
        * tests/OctetSeq/run_test2.pl:
        * tests/Bug_3000_Regression/run_test.pl:
        * tests/Bug_3068_Regression/run_test.pl:
        * tests/Bug_2186_Regression/run_test.pl:

          Test are converted to use new test framework
          and added to fuzz build.

6 files changed, 39 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4429aa99a83..34141f4c73a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Nov 27 10:12:19 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
+
+        * tests/OctetSeq/run_test1.pl:
+        * tests/OctetSeq/run_test2.pl:
+        * tests/Bug_3000_Regression/run_test.pl:
+        * tests/Bug_3068_Regression/run_test.pl:
+        * tests/Bug_2186_Regression/run_test.pl:
+
+          Test are converted to use new test framework
+          and added to fuzz build.
+
 Thu Nov 26 12:45:41 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
 
         * tests/Bug_1361_Regression/run_test.pl:
diff --git a/TAO/tests/Bug_2186_Regression/run_test.pl b/TAO/tests/Bug_2186_Regression/run_test.pl
index d8ac13b24de..5b158671660 100755
--- a/TAO/tests/Bug_2186_Regression/run_test.pl
+++ b/TAO/tests/Bug_2186_Regression/run_test.pl
@@ -31,9 +31,11 @@ $client->DeleteFile($iorbase);
 my $client_iorbase_file = $client->LocalFile ($client_iorbase);
 $client->DeleteFile($client_iorbase);
 
+my $server_conf = $server->LocalFile ("server.conf");
+
 $SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
-                              "-ORBSvcConf server.conf " .
+                              "-ORBSvcConf $server_conf " .
                               "-o $server_iorfile");
 
 $port = $client->RandomPort ();
diff --git a/TAO/tests/Bug_3000_Regression/run_test.pl b/TAO/tests/Bug_3000_Regression/run_test.pl
index 86663fe1462..290a652f090 100755
--- a/TAO/tests/Bug_3000_Regression/run_test.pl
+++ b/TAO/tests/Bug_3000_Regression/run_test.pl
@@ -11,9 +11,6 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 
-# By default use RW wait startegy
-my $sr_svc_opt = "-ORBSvcConf rw.conf";
-
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
         $debug_level = '10';
@@ -30,6 +27,8 @@ my $iorfile = "test.ior";
 my $server_iorfile = $server->LocalFile ($iorfile);
 $server->DeleteFile($iorfile);
 
+my $server_conf = $server->LocalFile ("rw.conf");
+
 #Files which used by client1
 my $client1_iorfile = $client1->LocalFile ($iorfile);
 $client1->DeleteFile($iorfile);
@@ -40,7 +39,7 @@ $client2->DeleteFile($iorfile);
 
 $SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
-                              "$sr_svc_opt " .
+                              "-ORBSvcConf $server_conf " .
                               "-o $server_iorfile");
 
 $port1 = $client1->RandomPort ();
diff --git a/TAO/tests/Bug_3068_Regression/run_test.pl b/TAO/tests/Bug_3068_Regression/run_test.pl
index 2336e04a571..2ec2e3aa918 100755
--- a/TAO/tests/Bug_3068_Regression/run_test.pl
+++ b/TAO/tests/Bug_3068_Regression/run_test.pl
@@ -26,15 +26,17 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
+my $server_conf = $server->LocalFile ("server.conf");
+my $client_conf = $client->LocalFile ("client.conf");
 
 $SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
-                              "-ORBSvcConf server.conf " .
+                              "-ORBSvcConf $server_conf " .
                               "-ORBListenendpoints iiop://:/reuse_addr=0 " .
                               "-o $server_iorfile");
 
 $CL = $client->CreateProcess ("client",
-                              "-ORBSvcConf client.conf " .
+                              "-ORBSvcConf $client_conf " .
                               "-k file://$client_iorfile");
                               
 $server_status = $SV->Spawn ();
diff --git a/TAO/tests/OctetSeq/run_test1.pl b/TAO/tests/OctetSeq/run_test1.pl
index 5d932bb2b8b..12a000cc8d3 100755
--- a/TAO/tests/OctetSeq/run_test1.pl
+++ b/TAO/tests/OctetSeq/run_test1.pl
@@ -11,7 +11,7 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 
-$conf = $PerlACE::svcconf_ext;
+
 
 $client_iterations = '5000';
 
@@ -35,21 +35,26 @@ $status = 0;
 my $iorbase = "test.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 my $client_iorfile = $t3->LocalFile ($iorbase);
+
+my $server_conf = $server->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+my $client_conf = $client->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+my $t3_conf = $t3->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
 $SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
-                              "-ORBSvcConf svc1$conf " .
+                              "-ORBSvcConf $server_conf " .
                               "-o $server_iorfile");
 
 $T = $client->CreateProcess ("OctetSeq",
                              "-ORBdebuglevel $debug_level " .
-                             "-ORBSvcConf svc1$conf " .
+                             "-ORBSvcConf $client_conf " .
                              "-n $octet_iterations -l $low -h $high -s $step -q");
 
 $CL = $t3->CreateProcess ("client",
-                          "-ORBSvcConf svc1$conf " .
+                          "-ORBSvcConf $t3_conf " .
                           "-i $client_iterations -k file://$client_iorfile");
 
 print STDERR "\n\n==== Octet sequence passing test\n";
diff --git a/TAO/tests/OctetSeq/run_test2.pl b/TAO/tests/OctetSeq/run_test2.pl
index 67fa5e3f08e..b726ba06460 100755
--- a/TAO/tests/OctetSeq/run_test2.pl
+++ b/TAO/tests/OctetSeq/run_test2.pl
@@ -11,8 +11,6 @@ use PerlACE::TestTarget;
 $status = 0;
 $debug_level = '0';
 
-$conf = $PerlACE::svcconf_ext;
-
 $client_iterations = '5000';
 
 $octet_iterations = '32';
@@ -35,21 +33,27 @@ $status = 0;
 my $iorbase = "test.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 my $client_iorfile = $t3->LocalFile ($iorbase);
+
+my $server_conf = $server->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+my $client_conf = $client->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+my $t3_conf = $t3->LocalFile ("svc1" . $PerlACE::svcconf_ext);
+
+
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
 $SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
-                              "-ORBSvcConf svc2$conf " .
+                              "-ORBSvcConf $server_conf " .
                               "-o $server_iorfile");
 
 $T = $client->CreateProcess ("OctetSeq",
                              "-ORBdebuglevel $debug_level " .
-                             "-ORBSvcConf svc2$conf " .
+                             "-ORBSvcConf $client_conf " .
                              "-n $octet_iterations -l $low -h $high -s $step -q");
 
 $CL = $t3->CreateProcess ("client",
-                          "-ORBSvcConf svc2$conf " .
+                          "-ORBSvcConf $t3_conf " .
                           "-i $client_iterations -k file://$client_iorfile");
 
 print STDERR "\n\n==== Octet sequence passing test\n";