Fri Sep 2 12:51:23 2005 Ciju John <john_c@ociweb.com>

5 files changed, 12 insertions, 19 deletions

diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index a91bc7699ca..0931f18f506 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -1,20 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, messaging {
+project(*Server): taoserver, messaging {
   Source_Files {
     Payload_Receiver.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, messaging {
-  exename = client
-
+project(*Client): taoclient, messaging {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
     client.cpp
   }
 }
-
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index 9e8471aad06..a73c1afbc1c 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "Client_Task.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(Big_Request_Muxing, Client_Task, "$Id$")
 
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index 40749c4b54d..64a91bf857e 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -12,7 +12,8 @@ Payload_Receiver::Payload_Receiver (int expected)
 }
 
 void
-Payload_Receiver::more_data (const Test::Payload& payload ACE_ENV_ARG_DECL)
+Payload_Receiver::more_data (const Test::Payload& payload
+			     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (payload.length() > 0)
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index d3376c72879..27544cb0e69 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -8,13 +8,6 @@
 
 #include "TestS.h"
 
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
 /// Implement the Test::Payload_Receiver interface
 /**
  * Simply print count how many bytes were received.
@@ -37,9 +30,5 @@ private:
   int expected_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 #endif /* BIG_REQUEST_MUXING_PAYLOAD_RECEIVER_H */
diff --git a/TAO/tests/Big_Request_Muxing/run_test.pl b/TAO/tests/Big_Request_Muxing/run_test.pl
index d202b4ad596..b46b5ef428e 100755
--- a/TAO/tests/Big_Request_Muxing/run_test.pl
+++ b/TAO/tests/Big_Request_Muxing/run_test.pl
@@ -10,7 +10,12 @@ use PerlACE::Run_Test;
 
 $iorfile = PerlACE::LocalFile ("server.ior");
 
-$SV  = new PerlACE::Process ("server", "-o $iorfile -e 1200");
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -e 1200");
+}
+else {
+    $SV  = new PerlACE::Process ("server", "-o $iorfile -e 1200");
+}
 $CL1 = new PerlACE::Process ("client", " -k file://$iorfile");
 $CL2 = new PerlACE::Process ("client", " -k file://$iorfile");
 
@@ -21,7 +26,7 @@ for ($n = 0; $n < 10; ++$n) {
   $SV->Spawn ();
   if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
       print STDERR "ERROR: cannot find file <$iorfile>\n";
-      $SV->Kill (); 
+      $SV->Kill ();
       exit 1;
   }