ChangeLogTag: Tue Apr 3 13:05:52 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 64 insertions, 0 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ef35310b038..9fe863da5c4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr  3 13:05:52 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_2734_Regression/README:
+        * tests/Bug_2734_Regression/run_test.pl:
+
+          Added a regression test for Bug 2734 based on the Timeout test.
+
 Tue Apr  3 12:37:37 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * tests/Makefile.am:
diff --git a/TAO/tests/Bug_2734_Regression/README b/TAO/tests/Bug_2734_Regression/README
new file mode 100644
index 00000000000..0f4f0928e9c
--- /dev/null
+++ b/TAO/tests/Bug_2734_Regression/README
@@ -0,0 +1,3 @@
+This test demonstrates Bug 2734 by running the Timeout test with different
+options.  If a name is given to the client's ORB, the test will stop working
+if Bug 2734 is reintroduced.
diff --git a/TAO/tests/Bug_2734_Regression/run_test.pl b/TAO/tests/Bug_2734_Regression/run_test.pl
new file mode 100755
index 00000000000..144afe9318a
--- /dev/null
+++ b/TAO/tests/Bug_2734_Regression/run_test.pl
@@ -0,0 +1,54 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::Run_Test;
+use strict;
+
+my $base_test = '../Timeout';
+my $status = 0;
+my $iorfile = 'server.ior';
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+                                          'PerlACE::Process');
+my $SV = $class->new("$base_test/server", "-o $iorfile");
+my $CL = new PerlACE::Process("$base_test/client",
+                              "-ORBid ClientORB -k file://$iorfile " .
+                              "-l 35 -h 40");
+
+unlink($iorfile);
+my $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) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill();
+    exit(1);
+}
+
+my $client = $CL->SpawnWaitKill(60);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+$server = $SV->WaitKill(5);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+unlink($iorfile);
+
+exit($status);