ChangeLogTag: Mon Feb 4 13:42:29 UTC 2008 Simon McQueen <sm@prismtech.com>

8 files changed, 66 insertions, 86 deletions

diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc b/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
index 86d6b108833..4ca7b20773f 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
@@ -11,21 +11,7 @@ project(*IDL): taoidldefaults {
 project(*Client): taoserver, ftclientorb {
   after += *IDL
 
-  exename = client 
-
-  verbatim (gnuace, local) {
-    ifeq ($(target_platform),)
-      tao_target := $(shell uname -srm)
-    else
-      tao_target = $(target_platform)
-    endif
-
-    ifeq (SunOS,$(findstring SunOS,$(tao_target)))
-      ifeq ($(CC),gcc)
-        LDFLAGS += -z now
-      endif
-    endif
-  }
+  exename = client
 
   Source_Files {
     client.cpp
@@ -42,27 +28,6 @@ project (*Server) : taoserver, ftclientorb, pi_server {
 
   exename = server
 
-  verbatim (gnuace, local) {
-    ifeq ($(target_platform),)
-      tao_target := $(shell uname -srm)
-    else
-      tao_target = $(target_platform)
-    endif
-
-    ifeq (SunOS,$(findstring SunOS,$(tao_target)))
-      ifeq ($(CC),gcc)
-        # So, in a standard build server requires '-z now' too.
-        ifndef debug
-          ifeq ($(optimize),1)
-            ifeq ($(inline),0)
-              LDFLAGS += -z now
-            endif # inline
-          endif # optimize
-        endif # debug
-      endif
-    endif
-  }
-
   Source_Files {
     server.cpp
     Hello.cpp
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index 0f734c4d3c8..b838677dfdc 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -12,21 +12,18 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 
 void
 Hello::shutdown ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 );
 }
 
 void
 Hello::ping ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
 Hello::throw_location_forward ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
index a295f259042..44a4638aaf5 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
@@ -22,15 +22,12 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown ();
 
-  virtual void ping ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping ();
+
+  virtual void throw_location_forward ();
 
-  virtual void throw_location_forward ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-        
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
   /// the application.
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
index a8866484a49..10fca204f29 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
@@ -12,7 +12,6 @@ void
 Server_ORBInitializer2::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
@@ -21,18 +20,16 @@ void
 Server_ORBInitializer2::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_server_request_interceptors (info
                                               );
-  
+
 }
 
 void
 Server_ORBInitializer2::register_server_request_interceptors (
     PortableInterceptor::ORBInitInfo_ptr info
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
@@ -46,7 +43,7 @@ Server_ORBInitializer2::register_server_request_interceptors (
 
   info->add_server_request_interceptor (server_interceptor.in ()
                                         );
-  
+
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
index 9f1cf68b4e4..71fc032b9d5 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
@@ -28,20 +28,17 @@ class Server_ORBInitializer2 :
 public:
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         );
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          );
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
          PortableInterceptor::ORBInitInfo_ptr info
-         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+         );
 
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index 803a5f3d544..8dd749ae6dc 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -36,14 +36,12 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
 
 char *
 TAO249_ServerRequest_Interceptor2::name ()
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
 TAO249_ServerRequest_Interceptor2::destroy ()
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -51,8 +49,6 @@ void
 TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr
   )
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
@@ -60,8 +56,6 @@ void
 TAO249_ServerRequest_Interceptor2::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri
   )
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op = ri->operation ();
 
@@ -170,7 +164,6 @@ void
 TAO249_ServerRequest_Interceptor2::send_reply (
   PortableInterceptor::ServerRequestInfo_ptr
   )
-ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -178,8 +171,6 @@ void
 TAO249_ServerRequest_Interceptor2::send_exception (
   PortableInterceptor::ServerRequestInfo_ptr
   )
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
@@ -187,8 +178,6 @@ void
 TAO249_ServerRequest_Interceptor2::send_other (
   PortableInterceptor::ServerRequestInfo_ptr
   )
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
index 3529920c92a..1e5af4cc2d5 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
@@ -46,40 +46,29 @@ TAO249_ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name ()
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual char * name ();
 
-virtual void destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException));
+virtual void destroy ();
 
 virtual void receive_request_service_contexts (
   PortableInterceptor::ServerRequestInfo_ptr ri
-  )
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
+  );
 
 virtual void receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    );
 
 virtual void send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
 virtual void send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    );
 
 virtual void send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
+    );
 //@}
 
 static CORBA::Object_var server_iogr_;
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl
index e69de29bb2d..fee5bc7bc29 100755
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl
@@ -0,0 +1,49 @@
+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;
+
+$status = 0;
+
+$iorfile = PerlACE::LocalFile ("server.ior");
+unlink $iorfile;
+
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
+$CL = new PerlACE::Process ("client", " -k file://$iorfile");
+    
+$SV->Spawn ();
+
+if (PerlACE::waitforfile_timed ($iorfile,
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+} 
+
+$client = $CL->SpawnWaitKill (300);
+
+if ($client != 0) {
+    print STDERR "ERROR: client returned $client\n";
+    $status = 1;
+}
+
+$server = $SV->WaitKill (10);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1;
+}
+
+unlink $iorfile;
+
+exit $status;