diff options
139 files changed, 1092 insertions, 199 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 64f05ace3ad..de62ffdbfa1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,149 @@ +Fri Apr 15 12:30:12 UTC 2005 Martin Corino <mcorino@remedy.nl> + + * tests/AMH_Exceptions/run_test.pl: + * tests/AMI/run_test.pl: + * tests/AMI_Buffering/run_buffer_size.pl: + * tests/AMI_Buffering/run_message_count.pl: + * tests/AMI_Buffering/run_timeout.pl: + * tests/AMI_Buffering/run_timeout_reactive.pl: + * tests/AMI_Timeouts/run_test.pl: + * tests/BiDirectional/run_test.pl: + * tests/Big_Oneways/run_test.pl: + * tests/Big_Reply/run_test.pl: + * tests/Big_Request_Muxing/run_test.pl: + * tests/Big_Twoways/run_test.pl: + * tests/Blocking_Sync_None/run_test.pl: + * tests/Bug_1020_Basic_Regression/run_test.pl: + * tests/Bug_1020_Regression/run_test.pl: + * tests/Bug_1269_Regression/run_test.pl: + * tests/Bug_1270_Regression/run_test.pl: + * tests/Bug_1361_Regression/run_test.pl: + * tests/Bug_1482_Regression/run_test.pl: + * tests/Bug_1495_Regression/run_test.pl: + * tests/Bug_1535_Regression/run_test.pl: + * tests/Bug_1551_Regression/run_test.pl: + * tests/Bug_1568_Regression/run_test.pl: + * tests/Bug_1670_Regression/run_test.pl: + * tests/Bug_1693_Test/run_test.pl: + * tests/Cache_Growth_Test/run_test.pl: + * tests/Codec/run_test.pl: + * tests/Collocation/run_test.pl: + * tests/Collocation_Opportunities/run_test.pl: + * tests/Collocation_Tests/run_test.pl: + * tests/Connect_Strategy_Test/run_test.pl: + * tests/Connection_Timeout/run_test.pl: + * tests/Crashed_Callback/run_test.pl: + * tests/DSI_Gateway/run_test.pl: + * tests/DynAny_Test/run_test.pl: + * tests/Exposed_Policies/run_test.pl: + * tests/File_IO/run_test.pl: + * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl: + * tests/Hang_Shutdown/run_test.pl: + * tests/Hello/run_test.pl: + * tests/IDL_Test/run_test.pl: + * tests/IORManipulation/run_test.pl: + * tests/InterOp-Naming/run_test.pl: + * tests/Leader_Followers/run_test.pl: + * tests/MProfile_Connection_Timeout/run_test.pl: + * tests/MT_BiDir/run_test.pl: + * tests/MT_Client/run_test.pl: + * tests/MT_Server/run_test.pl: + * tests/MT_Timeout/run_test.pl: + * tests/Multiple_Inheritance/run_test.pl: + * tests/Muxing/run_test.pl: + * tests/Native_Exceptions/run_test.pl: + * tests/NestedUpcall/MT_Client_Test/run_test.pl: + * tests/NestedUpcall/Simple/run_test.pl: + * tests/NestedUpcall/Triangle_Test/run_test.pl: + * tests/Nested_Event_Loop/run_test.pl: + * tests/Nested_Upcall_Crash/run_test.pl: + * tests/No_Server_MT_Connect_Test/run_test.pl: + * tests/OBV/Any/run_test.pl: + * tests/OBV/Collocated/Forward/run_test.pl: + * tests/OBV/Factory/run_test.pl: + * tests/OBV/Forward/run_test.pl: + * tests/OBV/TC_Alignment/run_test.pl: + * tests/ORB_destroy/run_test.pl: + * tests/ORB_init/run_test.pl: + * tests/ORB_shutdown/run_test.pl: + * tests/ORT/run_test.pl: + * tests/OctetSeq/run_test.pl: + * tests/OctetSeq/run_test1.pl: + * tests/OctetSeq/run_test2.pl: + * tests/Oneway_Buffering/run_buffer_size.pl: + * tests/Oneway_Buffering/run_message_count.pl: + * tests/Oneway_Buffering/run_timeout.pl: + * tests/Oneway_Buffering/run_timeout_reactive.pl: + * tests/Oneways_Invoking_Twoways/run_test.pl: + * tests/POA/Current/run_test.pl: + * tests/POA/Default_Servant/run_test.pl: + * tests/POA/Etherealization/run_test.pl: + * tests/POA/Excessive_Object_Deactivations/run_test.pl: + * tests/POA/Identity/run_test.pl: + * tests/POA/MT_Servant_Locator/run_test.pl: + * tests/POA/Nested_Non_Servant_Upcalls/run_test.pl: + * tests/POA/Non_Servant_Upcalls/run_test.pl: + * tests/POA/Object_Reactivation/run_test.pl: + * tests/POA/POA_Destruction/run_test.pl: + * tests/POA/Persistent_ID/run_test.pl: + * tests/POA/Policies/run_test.pl: + * tests/POA/Single_Threaded_POA/run_test.pl: + * tests/POA/wait_for_completion/run_test.pl: + * tests/Param_Test/run_test.pl: + * tests/Policies/run_test.pl: + * tests/Portable_Interceptors/AMI/run_test.pl: + * tests/Portable_Interceptors/Bug_1559/run_test.pl: + * tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: + * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl: + * tests/Portable_Interceptors/Dynamic/run_test.pl: + * tests/Portable_Interceptors/ForwardRequest/run_test.pl: + * tests/Portable_Interceptors/IORInterceptor/run_test.pl: + * tests/Portable_Interceptors/ORB_Shutdown/run_test.pl: + * tests/Portable_Interceptors/PICurrent/run_test.pl: + * tests/Portable_Interceptors/PolicyFactory/run_test.pl: + * tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: + * tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: + * tests/Queued_Message_Test/run_test.pl: + * tests/RTCORBA/Banded_Connections/run_test.pl: + * tests/RTCORBA/Client_Propagated/run_test.pl: + * tests/RTCORBA/Client_Protocol/run_test.pl: + * tests/RTCORBA/Collocation/run_test.pl: + * tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: + * tests/RTCORBA/Linear_Priority/run_test.pl: + * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: + * tests/RTCORBA/ORB_init/run_test.pl: + * tests/RTCORBA/Persistent_IOR/run_test.pl: + * tests/RTCORBA/Policies/run_test.pl: + * tests/RTCORBA/Policy_Combinations/run_test.pl: + * tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: + * tests/RTCORBA/Private_Connection/run_test.pl: + * tests/RTCORBA/RTMutex/run_test.pl: + * tests/RTCORBA/Server_Declared/run_test.pl: + * tests/RTCORBA/Thread_Pool/run_test.pl: + * tests/RTScheduling/Current/run_test.pl: + * tests/RTScheduling/DT_Spawn/run_test.pl: + * tests/RTScheduling/Scheduling_Interceptor/run_test.pl: + * tests/RTScheduling/Thread_Cancel/run_test.pl: + * tests/RTScheduling/VoidData/run_test.pl: + * tests/Reliable_Oneways/run_test.pl: + * tests/Sequence_Unit_Tests/run_test.pl: + * tests/Servant_To_Reference_Test/run_test.pl: + * tests/Server_Leaks/run_test.pl: + * tests/Single_Read/run_test.pl: + * tests/Smart_Proxies/run_test.pl: + * tests/Stack_Recursion/run_test.pl: + * tests/Timed_Buffered_Oneways/run_test.pl: + * tests/Timeout/run_test.pl: + * tests/Two_Objects/run_test.pl: + * tests/Typedef_String_Array/run_test.pl: + * tests/UNKNOWN_Exception/run_test.pl: + + Changed to enable these scripts to run from autobuild for VxWorks builds. + + * tests/OBV/TC_Alignment/client.cpp: + + Added commandline option to sepcifiy IOR inputfile. + Fri Apr 15 12:43:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/PortableServer_ORBInitializer.h: diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl index 3d4fefd589f..deff794042a 100755 --- a/TAO/tests/AMH_Exceptions/run_test.pl +++ b/TAO/tests/AMH_Exceptions/run_test.pl @@ -19,7 +19,12 @@ $iorfile = PerlACE::LocalFile("test.ior"); unlink $iorfile; -$AMH = new PerlACE::Process ("server", ""); +if (PerlACE::is_vxworks_test()) { + $AMH = new PerlACE::ProcessVX ("server", ""); +} +else { + $AMH = new PerlACE::Process ("server", ""); +} $CL = new PerlACE::Process ("client", ""); # Run the AMH server. diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl index c16addfe36b..f3e7493a8fd 100755 --- a/TAO/tests/AMI/run_test.pl +++ b/TAO/tests/AMI/run_test.pl @@ -29,8 +29,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", - "-ORBdebuglevel $debug_level -d -o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBdebuglevel $debug_level -d -o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBdebuglevel $debug_level -d -o $iorfile"); +} $SV->Spawn (); @@ -47,7 +51,7 @@ $CL = new PerlACE::Process ("simple_client", . " -i $iterations -x -d"); $client = $CL->SpawnWaitKill (60); -$server = $SV->WaitKill (5); +$server = $SV->WaitKill (10); unlink $iorfile; diff --git a/TAO/tests/AMI_Buffering/run_buffer_size.pl b/TAO/tests/AMI_Buffering/run_buffer_size.pl index d753ab02cf4..9eccd0b7e84 100755 --- a/TAO/tests/AMI_Buffering/run_buffer_size.pl +++ b/TAO/tests/AMI_Buffering/run_buffer_size.pl @@ -14,7 +14,13 @@ $server_iorfile = PerlACE::LocalFile ("server.ior"); unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/AMI_Buffering/run_message_count.pl b/TAO/tests/AMI_Buffering/run_message_count.pl index 8d8f727425b..e25a1eae4fa 100755 --- a/TAO/tests/AMI_Buffering/run_message_count.pl +++ b/TAO/tests/AMI_Buffering/run_message_count.pl @@ -14,7 +14,13 @@ $server_iorfile = PerlACE::LocalFile ("server.ior"); unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/AMI_Buffering/run_timeout.pl b/TAO/tests/AMI_Buffering/run_timeout.pl index 9352c94075d..049e0ab3926 100755 --- a/TAO/tests/AMI_Buffering/run_timeout.pl +++ b/TAO/tests/AMI_Buffering/run_timeout.pl @@ -14,7 +14,13 @@ $server_iorfile = PerlACE::LocalFile ("server.ior"); unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/AMI_Buffering/run_timeout_reactive.pl b/TAO/tests/AMI_Buffering/run_timeout_reactive.pl index 31f09190b88..f91953726d9 100755 --- a/TAO/tests/AMI_Buffering/run_timeout_reactive.pl +++ b/TAO/tests/AMI_Buffering/run_timeout_reactive.pl @@ -14,7 +14,13 @@ $server_iorfile = PerlACE::LocalFile ("server.ior"); unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/AMI_Timeouts/run_test.pl b/TAO/tests/AMI_Timeouts/run_test.pl index e6596d067a3..1be52c73e61 100755 --- a/TAO/tests/AMI_Timeouts/run_test.pl +++ b/TAO/tests/AMI_Timeouts/run_test.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-d -o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-d -o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-d -o $iorfile"); +} $CL = new PerlACE::Process ("client", "-k file://$iorfile"); $SV->Spawn (); diff --git a/TAO/tests/BiDirectional/run_test.pl b/TAO/tests/BiDirectional/run_test.pl index d448613167e..3466c0c0144 100755 --- a/TAO/tests/BiDirectional/run_test.pl +++ b/TAO/tests/BiDirectional/run_test.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile -i 100"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior -i 100"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile -i 100"); +} $CL = new PerlACE::Process ("client", "-k file://$iorfile"); $SV->Spawn (); diff --git a/TAO/tests/Big_Oneways/run_test.pl b/TAO/tests/Big_Oneways/run_test.pl index 7319e31d4f9..3843f03c8e0 100755 --- a/TAO/tests/Big_Oneways/run_test.pl +++ b/TAO/tests/Big_Oneways/run_test.pl @@ -28,7 +28,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); $status = 0; unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior $server_args"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); +} $CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); $CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); $CL3 = new PerlACE::Process ("client", " -k file://$iorfile"); diff --git a/TAO/tests/Big_Reply/run_test.pl b/TAO/tests/Big_Reply/run_test.pl index 4c2bf3c3b30..3ff43b31c90 100755 --- a/TAO/tests/Big_Reply/run_test.pl +++ b/TAO/tests/Big_Reply/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/Big_Request_Muxing/run_test.pl b/TAO/tests/Big_Request_Muxing/run_test.pl index 4e8889aa068..5036fd1408d 100755 --- a/TAO/tests/Big_Request_Muxing/run_test.pl +++ b/TAO/tests/Big_Request_Muxing/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); $CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); diff --git a/TAO/tests/Big_Twoways/run_test.pl b/TAO/tests/Big_Twoways/run_test.pl index e8fbdd2c8ce..78ca7a9d7fd 100755 --- a/TAO/tests/Big_Twoways/run_test.pl +++ b/TAO/tests/Big_Twoways/run_test.pl @@ -28,7 +28,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); $status = 0; unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior $server_args"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); +} $CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); $CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); $CL3 = new PerlACE::Process ("client", " -k file://$iorfile"); diff --git a/TAO/tests/Blocking_Sync_None/run_test.pl b/TAO/tests/Blocking_Sync_None/run_test.pl index b6ea9d5230b..51325a4dc56 100755 --- a/TAO/tests/Blocking_Sync_None/run_test.pl +++ b/TAO/tests/Blocking_Sync_None/run_test.pl @@ -13,7 +13,12 @@ unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl index 6d3ad554f13..c712b41efc6 100755 --- a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl +++ b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/Bug_1020_Regression/run_test.pl b/TAO/tests/Bug_1020_Regression/run_test.pl index 732e3b9afd3..18a834079b0 100755 --- a/TAO/tests/Bug_1020_Regression/run_test.pl +++ b/TAO/tests/Bug_1020_Regression/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile -ORBdotteddecimaladdresses 1"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior -ORBdotteddecimaladdresses 1"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile -ORBdotteddecimaladdresses 1"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/Bug_1269_Regression/run_test.pl b/TAO/tests/Bug_1269_Regression/run_test.pl index d9588d8bec8..dab459717ee 100755 --- a/TAO/tests/Bug_1269_Regression/run_test.pl +++ b/TAO/tests/Bug_1269_Regression/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/Bug_1270_Regression/run_test.pl b/TAO/tests/Bug_1270_Regression/run_test.pl index 80402bb0270..9c650eae188 100755 --- a/TAO/tests/Bug_1270_Regression/run_test.pl +++ b/TAO/tests/Bug_1270_Regression/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl index 9e74ef51116..fd7ad7ee2d7 100755 --- a/TAO/tests/Bug_1361_Regression/run_test.pl +++ b/TAO/tests/Bug_1361_Regression/run_test.pl @@ -9,10 +9,15 @@ use lib '../../../bin'; use PerlACE::Run_Test; use POSIX "sys_wait_h"; -$iorfile = PerlACE::LocalFile ("server$$.ior"); +$iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", " -o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $threads = int (rand() * 6) + 1; $CL = new PerlACE::Process ("client", "-k file://$iorfile -t $threads"); @@ -35,7 +40,7 @@ while (($elapsed < $max_running_time) ) # Start all clients in parallel $client = $CL->Spawn (); - $CL->WaitKill(60) unless $client1 < 0; + $CL->WaitKill(60) unless $client < 0; print STDERR "checking server alive\n"; diff --git a/TAO/tests/Bug_1482_Regression/run_test.pl b/TAO/tests/Bug_1482_Regression/run_test.pl index 1075e88e2c2..a62e792625a 100755 --- a/TAO/tests/Bug_1482_Regression/run_test.pl +++ b/TAO/tests/Bug_1482_Regression/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile -ORBdotteddecimaladdresses 1"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior -ORBdotteddecimaladdresses 1"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile -ORBdotteddecimaladdresses 1"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/Bug_1495_Regression/run_test.pl b/TAO/tests/Bug_1495_Regression/run_test.pl index 466f83641dc..981d1300a59 100755 --- a/TAO/tests/Bug_1495_Regression/run_test.pl +++ b/TAO/tests/Bug_1495_Regression/run_test.pl @@ -15,8 +15,13 @@ unlink $inputfile; unlink $thrserverfile; $status = 0; -$CL = new PerlACE::Process ("client"); -$SV = new PerlACE::Process ("server"); +if (PerlACE::is_vxworks_test()) { + $CL = new PerlACE::ProcessVX ("client"); +} +else { + $CL = new PerlACE::Process ("client"); +} +$SV = new PerlACE::Process ("server", "-o $inputfile -i file://$thrserverfile"); $client = $CL->Spawn (); diff --git a/TAO/tests/Bug_1535_Regression/run_test.pl b/TAO/tests/Bug_1535_Regression/run_test.pl index 3182220ecf1..6e368d26fcc 100755 --- a/TAO/tests/Bug_1535_Regression/run_test.pl +++ b/TAO/tests/Bug_1535_Regression/run_test.pl @@ -10,8 +10,12 @@ use PerlACE::Run_Test; $status = 0; -$SV = new PerlACE::Process ("bug_1535_regression", ""); - +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("bug_1535_regression"); +} +else { + $SV = new PerlACE::Process ("bug_1535_regression"); +} $SV->Spawn (); diff --git a/TAO/tests/Bug_1551_Regression/run_test.pl b/TAO/tests/Bug_1551_Regression/run_test.pl index bd6037a58b7..380a98e495d 100755 --- a/TAO/tests/Bug_1551_Regression/run_test.pl +++ b/TAO/tests/Bug_1551_Regression/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile -ORBdotteddecimaladdresses 1"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior -ORBdotteddecimaladdresses 1"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile -ORBdotteddecimaladdresses 1"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/Bug_1568_Regression/run_test.pl b/TAO/tests/Bug_1568_Regression/run_test.pl index 54d0317c39e..052826cdd5c 100755 --- a/TAO/tests/Bug_1568_Regression/run_test.pl +++ b/TAO/tests/Bug_1568_Regression/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/Bug_1670_Regression/run_test.pl b/TAO/tests/Bug_1670_Regression/run_test.pl index 54d0317c39e..052826cdd5c 100755 --- a/TAO/tests/Bug_1670_Regression/run_test.pl +++ b/TAO/tests/Bug_1670_Regression/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/Bug_1693_Test/run_test.pl b/TAO/tests/Bug_1693_Test/run_test.pl index 255f60afe65..359ab100158 100755 --- a/TAO/tests/Bug_1693_Test/run_test.pl +++ b/TAO/tests/Bug_1693_Test/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; print STDERR "\n\n==== Running Bug_1693_Test test\n"; -$T = new PerlACE::Process ("client"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("client"); +} +else { + $T = new PerlACE::Process ("client"); +} $test = $T->SpawnWaitKill (15); diff --git a/TAO/tests/Cache_Growth_Test/run_test.pl b/TAO/tests/Cache_Growth_Test/run_test.pl index 2411ad764d5..35db649c452 100755 --- a/TAO/tests/Cache_Growth_Test/run_test.pl +++ b/TAO/tests/Cache_Growth_Test/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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"); $CL1 = new PerlACE::Process ("client", " -k file://$iorfile -x"); diff --git a/TAO/tests/Codec/run_test.pl b/TAO/tests/Codec/run_test.pl index 16c1b3ddd8f..957553ed86a 100755 --- a/TAO/tests/Codec/run_test.pl +++ b/TAO/tests/Codec/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; print STDERR "\n\n==== Running Codec test\n"; -$T = new PerlACE::Process ("client"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("client"); +} +else { + $T = new PerlACE::Process ("client"); +} $test = $T->SpawnWaitKill (15); diff --git a/TAO/tests/Collocation/run_test.pl b/TAO/tests/Collocation/run_test.pl index abca156fcf3..191f0046122 100755 --- a/TAO/tests/Collocation/run_test.pl +++ b/TAO/tests/Collocation/run_test.pl @@ -12,7 +12,13 @@ $status = 0; print STDOUT "Collocation\n\n"; -$SV = new PerlACE::Process ("Collocation"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("Collocation"); +} +else { + $SV = new PerlACE::Process ("Collocation"); +} + $server = $SV->SpawnWaitKill (60); diff --git a/TAO/tests/Collocation_Opportunities/run_test.pl b/TAO/tests/Collocation_Opportunities/run_test.pl index 8a8528f903e..bb3e5277ea9 100755 --- a/TAO/tests/Collocation_Opportunities/run_test.pl +++ b/TAO/tests/Collocation_Opportunities/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Collocation_Opportunities"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Collocation_Opportunities"); +} +else { + $T = new PerlACE::Process ("Collocation_Opportunities"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/Collocation_Tests/run_test.pl b/TAO/tests/Collocation_Tests/run_test.pl index 73766e57cc5..c34197a9c57 100755 --- a/TAO/tests/Collocation_Tests/run_test.pl +++ b/TAO/tests/Collocation_Tests/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("Collocated_Test"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("Collocated_Test"); +} +else { + $SV = new PerlACE::Process ("Collocated_Test"); +} print STDERR "======== Running in Default Mode \n"; $SV->Arguments ("-o $iorfile -k file://$iorfile"); diff --git a/TAO/tests/Connect_Strategy_Test/run_test.pl b/TAO/tests/Connect_Strategy_Test/run_test.pl index f7a37d77f93..c5797abb37e 100755 --- a/TAO/tests/Connect_Strategy_Test/run_test.pl +++ b/TAO/tests/Connect_Strategy_Test/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-ORBSvcConf reactor$PerlACE::svcconf_ext -k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-ORBSvcConf blocked$PerlACE::svcconf_ext -k file://$iorfile -x 1"); diff --git a/TAO/tests/Connection_Timeout/run_test.pl b/TAO/tests/Connection_Timeout/run_test.pl index aa5d7eb4309..8a5b5817f0f 100755 --- a/TAO/tests/Connection_Timeout/run_test.pl +++ b/TAO/tests/Connection_Timeout/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; $status = 0; -$CL = new PerlACE::Process ("client", ""); +if (PerlACE::is_vxworks_test()) { + $CL = new PerlACE::ProcessVX ("client", ""); +} +else { + $CL = new PerlACE::Process ("client", ""); +} $client = $CL->SpawnWaitKill (25); diff --git a/TAO/tests/Crashed_Callback/run_test.pl b/TAO/tests/Crashed_Callback/run_test.pl index 20b71ef1802..4fbbc680ff2 100755 --- a/TAO/tests/Crashed_Callback/run_test.pl +++ b/TAO/tests/Crashed_Callback/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/DSI_Gateway/run_test.pl b/TAO/tests/DSI_Gateway/run_test.pl index 7f38e959458..46ca8588693 100755 --- a/TAO/tests/DSI_Gateway/run_test.pl +++ b/TAO/tests/DSI_Gateway/run_test.pl @@ -16,7 +16,12 @@ unlink $gwfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $svfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $svfile"); +} $GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile"); $CL = new PerlACE::Process ("client", "-k file://$gwfile -x -i 100"); diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl index cb372010f44..6e894398de5 100755 --- a/TAO/tests/DynAny_Test/run_test.pl +++ b/TAO/tests/DynAny_Test/run_test.pl @@ -15,7 +15,12 @@ sub run_test { my $type = shift(@_); - $BT = new PerlACE::Process ("basic_test", "-t $type"); + if (PerlACE::is_vxworks_test()) { + $BT = new PerlACE::ProcessVX ("basic_test", "-t $type"); + } + else { + $BT = new PerlACE::Process ("basic_test", "-t $type"); + } my $basictest = $BT->SpawnWaitKill (10); if ($basictest != 0) { diff --git a/TAO/tests/Exposed_Policies/run_test.pl b/TAO/tests/Exposed_Policies/run_test.pl index 1bfc4949f2c..869ad6de981 100755 --- a/TAO/tests/Exposed_Policies/run_test.pl +++ b/TAO/tests/Exposed_Policies/run_test.pl @@ -13,11 +13,20 @@ $obj_file = PerlACE::LocalFile ("Object.cfg"); $base_ior_file = PerlACE::LocalFile ("default.ior"); $overridden_ior_file = PerlACE::LocalFile ("overridden.ior"); -$SV = new PerlACE::Process ("server", - " -POAConfigFile $poa_file" . - " -ObjectConfigFile $obj_file" . - " -BaseObjectIOR $base_ior_file" . - " -OverriddenIOR $overridden_ior_file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", + " -POAConfigFile POA.cfg" . + " -ObjectConfigFile Object.cfg" . + " -BaseObjectIOR default.ior" . + " -OverriddenIOR overridden.ior"); +} +else { + $SV = new PerlACE::Process ("server", + " -POAConfigFile $poa_file" . + " -ObjectConfigFile $obj_file" . + " -BaseObjectIOR $base_ior_file" . + " -OverriddenIOR $overridden_ior_file"); +} if ($^O eq "dec_osf") { $poa_file = PerlACE::LocalFile ("POA.cfg.tru64"); diff --git a/TAO/tests/File_IO/run_test.pl b/TAO/tests/File_IO/run_test.pl index 32f1198ef12..302f5244e4b 100755 --- a/TAO/tests/File_IO/run_test.pl +++ b/TAO/tests/File_IO/run_test.pl @@ -13,7 +13,12 @@ $status = 0; unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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 $iorfile"); $SV->Spawn (); diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl index 92f6cad1a32..c8c8761853f 100755 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl @@ -17,10 +17,19 @@ $endien = (pack('L', 0x41424344) eq 'ABCD' ? '_be' : ''); unlink $iorfile; -$SV = new PerlACE::Process ('server', +if (PerlACE::is_vxworks_test()) { + $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'}; + $SV = new PerlACE::ProcessVX ('server', '-ORBEndpoint ' . "iiop://$TARGETHOSTNAME" . ":$port " . "-ORBDebugLevel $debug"); +} +else { + $SV = new PerlACE::Process ('server', + '-ORBEndpoint ' . + "iiop://$TARGETHOSTNAME" . ":$port " . + "-ORBDebugLevel $debug"); +} $SV->Spawn (); if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { @@ -29,7 +38,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { exit 1; } -my($cl) = system("$^X dribble.pl --port=$port " . +my($cl) = system("$^X dribble.pl --host=$TARGETHOSTNAME --port=$port " . "--stream=giop1.2_fragments$endien.dat " . "--layout=giop1.2_fragments$endien.layout"); if ($cl != 0) { diff --git a/TAO/tests/Hang_Shutdown/run_test.pl b/TAO/tests/Hang_Shutdown/run_test.pl index 5b4247fbbff..9fbc65b65ec 100755 --- a/TAO/tests/Hang_Shutdown/run_test.pl +++ b/TAO/tests/Hang_Shutdown/run_test.pl @@ -9,11 +9,16 @@ use lib '../../../bin'; use PerlACE::Run_Test; $status = 0; -$iorfile = "server.ior"; +$iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", ""); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server"); +} +else { + $SV = new PerlACE::Process ("server"); +} $CL = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); @@ -43,7 +48,12 @@ unlink $iorfile; ################################ print STDERR "===== Client with RW handler\n"; -$SV1 = new PerlACE::Process ("server", ""); +if (PerlACE::is_vxworks_test()) { + $SV1 = new PerlACE::ProcessVX ("server"); +} +else { + $SV1 = new PerlACE::Process ("server"); +} $CL1 = new PerlACE::Process ("client", " -ORBSvcConf client.conf"); diff --git a/TAO/tests/Hello/run_test.pl b/TAO/tests/Hello/run_test.pl index 8c0d02aecd2..5d02e3606f1 100755 --- a/TAO/tests/Hello/run_test.pl +++ b/TAO/tests/Hello/run_test.pl @@ -8,13 +8,19 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; +$status = 0; + $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$status = 0; -$SV = new PerlACE::Process ("server", "-o $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, diff --git a/TAO/tests/IDL_Test/run_test.pl b/TAO/tests/IDL_Test/run_test.pl index 5f74f1ef6c2..09a7de77eee 100755 --- a/TAO/tests/IDL_Test/run_test.pl +++ b/TAO/tests/IDL_Test/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../bin"; use PerlACE::Run_Test; -$T = new PerlACE::Process ("main"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("main"); +} +else { + $T = new PerlACE::Process ("main"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/IORManipulation/run_test.pl b/TAO/tests/IORManipulation/run_test.pl index 6bb5b782e49..dcf092e17cd 100755 --- a/TAO/tests/IORManipulation/run_test.pl +++ b/TAO/tests/IORManipulation/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("IORTest"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("IORTest"); +} +else { + $T = new PerlACE::Process ("IORTest"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl index 57ccfce2675..25be880b026 100755 --- a/TAO/tests/InterOp-Naming/run_test.pl +++ b/TAO/tests/InterOp-Naming/run_test.pl @@ -18,9 +18,17 @@ $status = 0; print STDERR "\n\n==== InitRef test\n"; unlink $file; -$SV = new PerlACE::Process ("INS_test_server", - "-ORBEndpoint iiop://1.0@"."$TARGETHOSTNAME:$port " - . " -i object_name -o $file -ORBDottedDecimalAddresses 1"); +if (PerlACE::is_vxworks_test()) { + $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'}; + $SV = new PerlACE::ProcessVX ("INS_test_server", + "-ORBEndpoint iiop://1.0@"."$TARGETHOSTNAME:$port " + . " -i object_name -o test.ior -ORBDottedDecimalAddresses 1"); +} +else { + $SV = new PerlACE::Process ("INS_test_server", + "-ORBEndpoint iiop://1.0@"."$TARGETHOSTNAME:$port " + . " -i object_name -o $file -ORBDottedDecimalAddresses 1"); +} $SV->Spawn (); @@ -31,7 +39,7 @@ if (PerlACE::waitforfile_timed ($file, 10) == -1) { } $CL = new PerlACE::Process ("INS_test_client", - " random_service " + "random_service " ."-ORBInitRef random_service=" ."corbaloc::1.1@"."$TARGETHOSTNAME:$port/object_name"); diff --git a/TAO/tests/Leader_Followers/run_test.pl b/TAO/tests/Leader_Followers/run_test.pl index 32052e10a5d..b9f743f3a6f 100755 --- a/TAO/tests/Leader_Followers/run_test.pl +++ b/TAO/tests/Leader_Followers/run_test.pl @@ -13,7 +13,14 @@ $iorfile = PerlACE::LocalFile ("lf.ior"); $tpool_reactor_directive = "-ORBsvcconfdirective \"static Advanced_Resource_Factory '-ORBreactortype tp'\""; $select_reactor_directive = "-ORBsvcconfdirective \"static Advanced_Resource_Factory '-ORBreactortype select_mt'\""; -$SV = new PerlACE::Process ("server"); +if (PerlACE::is_vxworks_test()) { + $sv_iorfile = "lf.ior"; + $SV = new PerlACE::ProcessVX ("server"); +} +else { + $sv_iorfile = $iofile; + $SV = new PerlACE::Process ("server"); +} $CL = new PerlACE::Process ("client"); sub run_client ($) @@ -112,7 +119,7 @@ if ($single == 1) { print STDERR "\n\n*** Single threaded server ***\n\n\n"; - $SV->Arguments ("-o $iorfile $select_reactor_directive"); + $SV->Arguments ("-o $sv_iorfile $select_reactor_directive"); $SV->Spawn (); @@ -139,7 +146,7 @@ if ($multi == 1) { print STDERR "\n\n*** Thread-Pool server ***\n\n\n"; - $SV->Arguments ("-o $iorfile -e 5 $tpool_reactor_directive"); + $SV->Arguments ("-o $sv_iorfile -e 5 $tpool_reactor_directive"); $SV->Spawn (); diff --git a/TAO/tests/MProfile_Connection_Timeout/run_test.pl b/TAO/tests/MProfile_Connection_Timeout/run_test.pl index 1788e40cc57..b0eaed5b425 100755 --- a/TAO/tests/MProfile_Connection_Timeout/run_test.pl +++ b/TAO/tests/MProfile_Connection_Timeout/run_test.pl @@ -16,7 +16,12 @@ unlink $iorfile2; $status = 0; -$SV1 = new PerlACE::Process ("server", "-o $iorfile1"); +if (PerlACE::is_vxworks_test()) { + $SV1 = new PerlACE::ProcessVX ("server", "-o server1.ior"); +} +else { + $SV1 = new PerlACE::Process ("server", "-o $iorfile1"); +} $SV2 = new PerlACE::Process ("server", "-o $iorfile2 -r"); $CL = new PerlACE::Process ("client", " -k file://$iorfile1 -m file://$iorfile2"); diff --git a/TAO/tests/MT_BiDir/run_test.pl b/TAO/tests/MT_BiDir/run_test.pl index d78718568ee..7187d34fcb9 100755 --- a/TAO/tests/MT_BiDir/run_test.pl +++ b/TAO/tests/MT_BiDir/run_test.pl @@ -10,11 +10,15 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile ("test.ior"); -$svcconf = PerlACE::LocalFile ("bala$PerlACE::svcconf_ext"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBSvcConf server$PerlACE::svcconf_ext -o $iorfile -c 3 -i 100"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBsvcconf server$PerlACE::svcconf_ext -o test.ior -c 3 -i 100"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBSvcConf server$PerlACE::svcconf_ext -o $iorfile -c 3 -i 100"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl index dfd578f9d79..faf34e8312e 100755 --- a/TAO/tests/MT_Client/run_test.pl +++ b/TAO/tests/MT_Client/run_test.pl @@ -29,7 +29,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBsvcconf $server_conf -ORBdebuglevel $debug_level -o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBsvcconf server$PerlACE::svcconf_ext -ORBdebuglevel $debug_level -o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBsvcconf $server_conf -ORBdebuglevel $debug_level -o $iorfile"); +} $CL = new PerlACE::Process ($client_process, "-ORBdebuglevel $debug_level " . "-k file://$iorfile " diff --git a/TAO/tests/MT_Server/run_test.pl b/TAO/tests/MT_Server/run_test.pl index 39937f4a0c6..f806a1750f7 100755 --- a/TAO/tests/MT_Server/run_test.pl +++ b/TAO/tests/MT_Server/run_test.pl @@ -15,7 +15,12 @@ $sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBsvcconf server$PerlACE::svcconf_ext -o test.ior -n $threads"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile -i 100"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile -i 100"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile -i 100"); diff --git a/TAO/tests/MT_Timeout/run_test.pl b/TAO/tests/MT_Timeout/run_test.pl index 9a5efa13651..b666399759a 100755 --- a/TAO/tests/MT_Timeout/run_test.pl +++ b/TAO/tests/MT_Timeout/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl index f367f0bc639..2af5c5f4d62 100755 --- a/TAO/tests/Multiple_Inheritance/run_test.pl +++ b/TAO/tests/Multiple_Inheritance/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-f $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-f server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-f $iorfile"); +} $CL = new PerlACE::Process ("client", "-f $iorfile"); $SV->Spawn (); diff --git a/TAO/tests/Muxing/run_test.pl b/TAO/tests/Muxing/run_test.pl index a96127632e8..b9cf425b774 100755 --- a/TAO/tests/Muxing/run_test.pl +++ b/TAO/tests/Muxing/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); $CL2 = new PerlACE::Process ("client", " -k file://$iorfile"); diff --git a/TAO/tests/Native_Exceptions/run_test.pl b/TAO/tests/Native_Exceptions/run_test.pl index b6db030b8cc..7028882d0f3 100755 --- a/TAO/tests/Native_Exceptions/run_test.pl +++ b/TAO/tests/Native_Exceptions/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL = new PerlACE::Process ("client", "-k file://$iorfile -i 1000"); $SV->Spawn (); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl index a4b04ac467b..04ef4d5362e 100755 --- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl @@ -16,7 +16,12 @@ $ior2file = PerlACE::LocalFile ("server2.ior"); unlink $ior1file; unlink $ior2file; -$SV1 = new PerlACE::Process ("server", "-o $ior1file"); +if (PerlACE::is_vxworks_test()) { + $SV1 = new PerlACE::ProcessVX ("server", "-o server1.ior"); +} +else { + $SV1 = new PerlACE::Process ("server", "-o $ior1file"); +} $SV2 = new PerlACE::Process ("server", "-o $ior2file"); $CL = new PerlACE::Process ("client", "-f $ior1file -g $ior2file -n 2 -i 10 -s 5"); diff --git a/TAO/tests/NestedUpcall/Simple/run_test.pl b/TAO/tests/NestedUpcall/Simple/run_test.pl index 277d5028c81..3f272e45fda 100755 --- a/TAO/tests/NestedUpcall/Simple/run_test.pl +++ b/TAO/tests/NestedUpcall/Simple/run_test.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-f $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-f test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-f $iorfile"); +} $CL = new PerlACE::Process ("client", "-k file://$iorfile -x"); print STDERR "\nrunning ST version of the client and the server\n\n"; @@ -43,7 +48,12 @@ if ($server != 0) { unlink $iorfile; -$SV->Arguments ("-f $iorfile -t 3"); +if (PerlACE::is_vxworks_test()) { + $SV->Arguments ("-f test.ior -t 3"); +} +else { + $SV->Arguments ("-f $iorfile -t 3"); +} $CL->Arguments ("-k file://$iorfile -x -n 10"); print STDERR "\nrunning MT version of the client and the server\n\n"; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl index 8bc5f340701..162b73124ad 100755 --- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl @@ -17,7 +17,12 @@ $ior2file = PerlACE::LocalFile ("serverb.ior"); unlink $ior1file; unlink $ior2file; -$SV1 = new PerlACE::Process ("server_A", "-o $ior1file"); +if (PerlACE::is_vxworks_test()) { + $SV1 = new PerlACE::ProcessVX ("server_A", "-o servera.ior"); +} +else { + $SV1 = new PerlACE::Process ("server_A", "-o $ior1file"); +} $SV2 = new PerlACE::Process ("server_B", "-o $ior2file"); $CL = new PerlACE::Process ("initiator", "-f $ior1file -g $ior2file"); diff --git a/TAO/tests/Nested_Event_Loop/run_test.pl b/TAO/tests/Nested_Event_Loop/run_test.pl index e107686c9be..df9c649b7f0 100755 --- a/TAO/tests/Nested_Event_Loop/run_test.pl +++ b/TAO/tests/Nested_Event_Loop/run_test.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL = new PerlACE::Process ("client", "-k file://$iorfile -x"); $SV->Spawn (); diff --git a/TAO/tests/Nested_Upcall_Crash/run_test.pl b/TAO/tests/Nested_Upcall_Crash/run_test.pl index bfacd98ebaf..8546ce10c19 100755 --- a/TAO/tests/Nested_Upcall_Crash/run_test.pl +++ b/TAO/tests/Nested_Upcall_Crash/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL2 = new PerlACE::Process ("client", "-k file://$iorfile"); $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); diff --git a/TAO/tests/No_Server_MT_Connect_Test/run_test.pl b/TAO/tests/No_Server_MT_Connect_Test/run_test.pl index 73d5d40901e..0b64a248eec 100755 --- a/TAO/tests/No_Server_MT_Connect_Test/run_test.pl +++ b/TAO/tests/No_Server_MT_Connect_Test/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", "-k file://$iorfile -x"); # Use a single thread in this test, because the strategy is only for # single threaded cases diff --git a/TAO/tests/OBV/Any/run_test.pl b/TAO/tests/OBV/Any/run_test.pl index d30a337cc10..d7e953d0896 100755 --- a/TAO/tests/OBV/Any/run_test.pl +++ b/TAO/tests/OBV/Any/run_test.pl @@ -22,7 +22,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/OBV/Collocated/Forward/run_test.pl b/TAO/tests/OBV/Collocated/Forward/run_test.pl index 57532133504..5069e2af2d5 100755 --- a/TAO/tests/OBV/Collocated/Forward/run_test.pl +++ b/TAO/tests/OBV/Collocated/Forward/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; -$CO = new PerlACE::Process ("collocated"); +if (PerlACE::is_vxworks_test()) { + $CO = new PerlACE::ProcessVX ("collocated"); +} +else { + $CO = new PerlACE::Process ("collocated"); +} $CO->Spawn (); diff --git a/TAO/tests/OBV/Factory/run_test.pl b/TAO/tests/OBV/Factory/run_test.pl index d30a337cc10..d7e953d0896 100755 --- a/TAO/tests/OBV/Factory/run_test.pl +++ b/TAO/tests/OBV/Factory/run_test.pl @@ -22,7 +22,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/OBV/Forward/run_test.pl b/TAO/tests/OBV/Forward/run_test.pl index 34e9e56675d..4424f402e68 100755 --- a/TAO/tests/OBV/Forward/run_test.pl +++ b/TAO/tests/OBV/Forward/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp index 55845270e89..25da5405c51 100644 --- a/TAO/tests/OBV/TC_Alignment/client.cpp +++ b/TAO/tests/OBV/TC_Alignment/client.cpp @@ -126,7 +126,7 @@ run_test (test_ptr objref, int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dx"); + ACE_Get_Opt get_opts (argc, argv, "dk:x"); int c; while ((c = get_opts ()) != -1) @@ -136,6 +136,10 @@ parse_args (int argc, char *argv[]) debug = 1; break; + case 'k': + ior_input_file = get_opts.optarg; + break; + case 'x': do_shutdown = 1; break; @@ -145,6 +149,7 @@ parse_args (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " "-d " + "-k <ior> " "-x " "\n", argv [0]), diff --git a/TAO/tests/OBV/TC_Alignment/run_test.pl b/TAO/tests/OBV/TC_Alignment/run_test.pl index 6dbc4634718..3d33b4e9db5 100755 --- a/TAO/tests/OBV/TC_Alignment/run_test.pl +++ b/TAO/tests/OBV/TC_Alignment/run_test.pl @@ -36,8 +36,13 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$SV = new PerlACE::Process ("server", " -ORBDottedDecimalAddresses 1"); -$CL = new PerlACE::Process ("client", " -x $debug"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", " -ORBDottedDecimalAddresses 1"); +} +else { + $SV = new PerlACE::Process ("server", " -ORBDottedDecimalAddresses 1"); +} +$CL = new PerlACE::Process ("client", "-k file://$iorfile -x $debug"); $SV->Spawn (); diff --git a/TAO/tests/ORB_destroy/run_test.pl b/TAO/tests/ORB_destroy/run_test.pl index 9f00793287b..9b13b6bcad8 100755 --- a/TAO/tests/ORB_destroy/run_test.pl +++ b/TAO/tests/ORB_destroy/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("ORB_destroy"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("ORB_destroy"); +} +else { + $T = new PerlACE::Process ("ORB_destroy"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/ORB_init/run_test.pl b/TAO/tests/ORB_init/run_test.pl index 89a6a345f8d..cab935271f0 100755 --- a/TAO/tests/ORB_init/run_test.pl +++ b/TAO/tests/ORB_init/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("ORB_init"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("ORB_init"); +} +else { + $T = new PerlACE::Process ("ORB_init"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/ORB_shutdown/run_test.pl b/TAO/tests/ORB_shutdown/run_test.pl index 4ee0b2887ae..a7df75abd33 100755 --- a/TAO/tests/ORB_shutdown/run_test.pl +++ b/TAO/tests/ORB_shutdown/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", ""); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server"); +} +else { + $SV = new PerlACE::Process ("server"); +} $SV->Spawn (); diff --git a/TAO/tests/ORT/run_test.pl b/TAO/tests/ORT/run_test.pl index bff9fdb19d1..e903275dc3c 100755 --- a/TAO/tests/ORT/run_test.pl +++ b/TAO/tests/ORT/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile -ORBId ORT_test_ORB -ORBServerId ORT_test_server"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior -ORBId ORT_test_ORB -ORBServerId ORT_test_server"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile -ORBId ORT_test_ORB -ORBServerId ORT_test_server"); +} $CL = new PerlACE::Process ("client", " -k file://$iorfile"); print STDERR "\n\n==== Running ORT (Object Reference Template) test\n"; diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl index a574ed6ef0e..310ec99245f 100755 --- a/TAO/tests/OctetSeq/run_test.pl +++ b/TAO/tests/OctetSeq/run_test.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL = new PerlACE::Process ("client", "-i 5000 -k file://$iorfile"); $T = new PerlACE::Process ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q"); diff --git a/TAO/tests/OctetSeq/run_test1.pl b/TAO/tests/OctetSeq/run_test1.pl index 5d8b133797d..501ad0b235a 100755 --- a/TAO/tests/OctetSeq/run_test1.pl +++ b/TAO/tests/OctetSeq/run_test1.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("test1.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBSvcConf svc1$PerlACE::svcconf_ext -o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBSvcConf svc1$PerlACE::svcconf_ext -o test1.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBSvcConf svc1$PerlACE::svcconf_ext -o $iorfile"); +} $CL = new PerlACE::Process ("client", "-ORBSvcConf svc1$PerlACE::svcconf_ext -i 5000 -k file://$iorfile"); $T = new PerlACE::Process ("OctetSeq", "-ORBSvcConf svc1$PerlACE::svcconf_ext -n 32 -l 8192 -h 8192 -s 1 -q"); diff --git a/TAO/tests/OctetSeq/run_test2.pl b/TAO/tests/OctetSeq/run_test2.pl index 9e91bd202e4..0b6849e3ac8 100755 --- a/TAO/tests/OctetSeq/run_test2.pl +++ b/TAO/tests/OctetSeq/run_test2.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("test2.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-ORBSvcConf svc2$PerlACE::svcconf_ext -o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBSvcConf svc2$PerlACE::svcconf_ext -o test2.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBSvcConf svc2$PerlACE::svcconf_ext -o $iorfile"); +} $CL = new PerlACE::Process ("client", "-ORBSvcConf svc2$PerlACE::svcconf_ext -i 5000 -k file://$iorfile"); $T = new PerlACE::Process ("OctetSeq", "-ORBSvcConf svc2$PerlACE::svcconf_ext -n 32 -l 8192 -h 8192 -s 1 -q"); diff --git a/TAO/tests/Oneway_Buffering/run_buffer_size.pl b/TAO/tests/Oneway_Buffering/run_buffer_size.pl index 831719aa55f..065f17c1d93 100755 --- a/TAO/tests/Oneway_Buffering/run_buffer_size.pl +++ b/TAO/tests/Oneway_Buffering/run_buffer_size.pl @@ -15,7 +15,13 @@ $status = 0; unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/Oneway_Buffering/run_message_count.pl b/TAO/tests/Oneway_Buffering/run_message_count.pl index 14c14b99f81..614b25b54ff 100755 --- a/TAO/tests/Oneway_Buffering/run_message_count.pl +++ b/TAO/tests/Oneway_Buffering/run_message_count.pl @@ -15,7 +15,13 @@ $status = 0; unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/Oneway_Buffering/run_timeout.pl b/TAO/tests/Oneway_Buffering/run_timeout.pl index 4e0c03c8b7b..4f8bbe2fde3 100755 --- a/TAO/tests/Oneway_Buffering/run_timeout.pl +++ b/TAO/tests/Oneway_Buffering/run_timeout.pl @@ -15,7 +15,13 @@ $status = 0; unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl b/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl index 31f09190b88..f91953726d9 100755 --- a/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl +++ b/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl @@ -14,7 +14,13 @@ $server_iorfile = PerlACE::LocalFile ("server.ior"); unlink $admin_iorfile; unlink $server_iorfile; -my $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +my $AD = 0; +if (PerlACE::is_vxworks_test()) { + $AD = new PerlACE::ProcessVX ("admin", "-o admin.ior"); +} +else { + $AD = new PerlACE::Process ("admin", "-o $admin_iorfile"); +} my $SV = new PerlACE::Process ("server", "-o $server_iorfile"); my $CL = new PerlACE::Process ("client", " -k file://$server_iorfile " diff --git a/TAO/tests/Oneways_Invoking_Twoways/run_test.pl b/TAO/tests/Oneways_Invoking_Twoways/run_test.pl index 0c7065b9528..8c885c7c88b 100755 --- a/TAO/tests/Oneways_Invoking_Twoways/run_test.pl +++ b/TAO/tests/Oneways_Invoking_Twoways/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL1 = new PerlACE::Process ("client", " -k file://$iorfile"); diff --git a/TAO/tests/POA/Current/run_test.pl b/TAO/tests/POA/Current/run_test.pl index cea8afc73f2..1edac4e229e 100755 --- a/TAO/tests/POA/Current/run_test.pl +++ b/TAO/tests/POA/Current/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Current"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Current"); +} +else { + $T = new PerlACE::Process ("Current"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Default_Servant/run_test.pl b/TAO/tests/POA/Default_Servant/run_test.pl index e789f4603df..2ed048478c7 100755 --- a/TAO/tests/POA/Default_Servant/run_test.pl +++ b/TAO/tests/POA/Default_Servant/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Default_Servant"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Default_Servant"); +} +else { + $T = new PerlACE::Process ("Default_Servant"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Etherealization/run_test.pl b/TAO/tests/POA/Etherealization/run_test.pl index ab30613b43e..b5adebe1007 100755 --- a/TAO/tests/POA/Etherealization/run_test.pl +++ b/TAO/tests/POA/Etherealization/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Etherealization"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Etherealization"); +} +else { + $T = new PerlACE::Process ("Etherealization"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl b/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl index a2b8052d1c6..40272f8e2f5 100755 --- a/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl +++ b/TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Excessive_Object_Deactivations"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Excessive_Object_Deactivations"); +} +else { + $T = new PerlACE::Process ("Excessive_Object_Deactivations"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Identity/run_test.pl b/TAO/tests/POA/Identity/run_test.pl index df9cee37e8f..dc23f38eeb4 100755 --- a/TAO/tests/POA/Identity/run_test.pl +++ b/TAO/tests/POA/Identity/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Identity", "-ORBobjrefstyle url"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Identity", "-ORBobjrefstyle url"); +} +else { + $T = new PerlACE::Process ("Identity", "-ORBobjrefstyle url"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/MT_Servant_Locator/run_test.pl b/TAO/tests/POA/MT_Servant_Locator/run_test.pl index 79bda52310e..bf3d2c7ee81 100755 --- a/TAO/tests/POA/MT_Servant_Locator/run_test.pl +++ b/TAO/tests/POA/MT_Servant_Locator/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process("MT_Servant_Locator"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("MT_Servant_Locator"); +} +else { + $T = new PerlACE::Process ("MT_Servant_Locator"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl b/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl index 0a7a2dc6041..1e3f3eb4a31 100755 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process("Nested_Non_Servant_Upcalls"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Nested_Non_Servant_Upcalls"); +} +else { + $T = new PerlACE::Process ("Nested_Non_Servant_Upcalls"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl b/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl index 07f6a6303ed..fe15c9f87f5 100755 --- a/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl +++ b/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process("Non_Servant_Upcalls"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Non_Servant_Upcalls"); +} +else { + $T = new PerlACE::Process ("Non_Servant_Upcalls"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Object_Reactivation/run_test.pl b/TAO/tests/POA/Object_Reactivation/run_test.pl index 2abe88af27c..d4a3a6d1fc5 100755 --- a/TAO/tests/POA/Object_Reactivation/run_test.pl +++ b/TAO/tests/POA/Object_Reactivation/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Object_Reactivation"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Object_Reactivation"); +} +else { + $T = new PerlACE::Process ("Object_Reactivation"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/POA_Destruction/run_test.pl b/TAO/tests/POA/POA_Destruction/run_test.pl index 39f350e7f22..8730e4c78dd 100755 --- a/TAO/tests/POA/POA_Destruction/run_test.pl +++ b/TAO/tests/POA/POA_Destruction/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("POA_Destruction"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("POA_Destruction"); +} +else { + $T = new PerlACE::Process ("POA_Destruction"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Persistent_ID/run_test.pl b/TAO/tests/POA/Persistent_ID/run_test.pl index 112bcce4e14..b00f3f38c86 100755 --- a/TAO/tests/POA/Persistent_ID/run_test.pl +++ b/TAO/tests/POA/Persistent_ID/run_test.pl @@ -9,12 +9,17 @@ use lib '../../../../bin'; use PerlACE::Run_Test; $status = 0; -$iorfile = "ior"; +$iorfile = "server.ior"; unlink $iorfile; -$SV = new PerlACE::Process ("server"); -$CL = new PerlACE::Process ("client", "-x"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-f server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-f $iorfile"); +} +$CL = new PerlACE::Process ("client", "-k file://$iorfile -x"); $SV->Spawn (); diff --git a/TAO/tests/POA/Policies/run_test.pl b/TAO/tests/POA/Policies/run_test.pl index 23ab04cd393..8c87f1f6805 100755 --- a/TAO/tests/POA/Policies/run_test.pl +++ b/TAO/tests/POA/Policies/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Policies"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Policies"); +} +else { + $T = new PerlACE::Process ("Policies"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/Single_Threaded_POA/run_test.pl b/TAO/tests/POA/Single_Threaded_POA/run_test.pl index 84619549100..c84a9db2a34 100755 --- a/TAO/tests/POA/Single_Threaded_POA/run_test.pl +++ b/TAO/tests/POA/Single_Threaded_POA/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Single_Threaded_POA"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Single_Threaded_POA"); +} +else { + $T = new PerlACE::Process ("Single_Threaded_POA"); +} $client = $T->SpawnWaitKill (60); diff --git a/TAO/tests/POA/wait_for_completion/run_test.pl b/TAO/tests/POA/wait_for_completion/run_test.pl index 3243a5feed5..515cd528d22 100755 --- a/TAO/tests/POA/wait_for_completion/run_test.pl +++ b/TAO/tests/POA/wait_for_completion/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("wait_for_completion"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("wait_for_completion"); +} +else { + $T = new PerlACE::Process ("wait_for_completion"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl index 20a1164bd90..e70233ece97 100755 --- a/TAO/tests/Param_Test/run_test.pl +++ b/TAO/tests/Param_Test/run_test.pl @@ -63,7 +63,12 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$SV = new PerlACE::Process ("server", "$debug -o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "$debug -o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "$debug -o $iorfile"); +} $CL = new PerlACE::Process ("client"); foreach $type (@types) { diff --git a/TAO/tests/Policies/run_test.pl b/TAO/tests/Policies/run_test.pl index 4d9888e2950..e1c112bf13d 100755 --- a/TAO/tests/Policies/run_test.pl +++ b/TAO/tests/Policies/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; $threads = '10'; -$T = new PerlACE::Process ("Manipulation", "-n $threads"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Manipulation", "-n $threads"); +} +else { + $T = new PerlACE::Process ("Manipulation", "-n $threads"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/Portable_Interceptors/AMI/run_test.pl b/TAO/tests/Portable_Interceptors/AMI/run_test.pl index 02041ea0c25..18a0aad1db7 100755 --- a/TAO/tests/Portable_Interceptors/AMI/run_test.pl +++ b/TAO/tests/Portable_Interceptors/AMI/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $file"); +} $CL = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl index 51c67cc0c58..61ad42d1d01 100755 --- a/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl @@ -13,7 +13,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBobjrefstyle url -o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file"); +} $CL = new PerlACE::Process ("client", "-ORBobjrefstyle url -f file://$file"); print STDERR "\n\n==== Running interceptor test\n"; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl index f4b4ecb0f99..f760f0e601b 100755 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl @@ -13,7 +13,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("Collocated_Test", "-ORBobjrefstyle url"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("Collocated_Test", "-ORBobjrefstyle url"); +} +else { + $SV = new PerlACE::Process ("Collocated_Test", "-ORBobjrefstyle url"); +} print STDERR "\n\n==== Running interceptor Dynamic test\n"; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl index 2eedd0a9821..b639e4068e3 100755 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("collocated"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("collocated"); +} +else { + $SV = new PerlACE::Process ("collocated"); +} print STDERR "======== Running in default mode \n"; # $SV->Arguments ("-o $iorfile -k file://$iorfile"); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl index 43c9f86a683..7e4b1644ecd 100755 --- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl @@ -13,7 +13,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBobjrefstyle url -o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file"); +} $CL = new PerlACE::Process ("client", "-ORBobjrefstyle url -f file://$file"); print STDERR "\n\n==== Running interceptor Dynamic test\n"; diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl index 08d3520bdbb..79926e14db6 100755 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl @@ -16,7 +16,12 @@ $file2 = PerlACE::LocalFile ("test2.ior"); unlink $file1; unlink $file2; -$SV = new PerlACE::Process ("server", "-o $file1 -o $file2"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test1.ior -o test2.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $file1 -o $file2"); +} $CL = new PerlACE::Process ("client", "-k file://$file1 -k file://$file2"); $status = 0; diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl index 5675008c909..d6c417c48cb 100755 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl @@ -13,7 +13,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("server", "-o $file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $file"); +} $CL = new PerlACE::Process ("client", "-k file://$file"); print STDERR "\n\n==== Running IORInterceptor test\n"; diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl b/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl index 74e0cc374e0..6c03ec53a45 100755 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl @@ -14,7 +14,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("server", "-o $file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $file"); +} $CL = new PerlACE::Process ("client", "-k file://$file"); $status = 0; diff --git a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl index e7ee83f4526..8c021fc59c4 100755 --- a/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl +++ b/TAO/tests/Portable_Interceptors/PICurrent/run_test.pl @@ -13,7 +13,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("server", "-o $file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $file"); +} $CL = new PerlACE::Process ("client", "-k file://$file"); print STDERR "\n\n==== Running PICurrent test\n"; diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl index d010f105f44..77a14c57980 100755 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl @@ -11,7 +11,12 @@ use PerlACE::Run_Test; $status = 0; -$SV = new PerlACE::Process ("server", ""); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server"); +} +else { + $SV = new PerlACE::Process ("server"); +} print STDERR "\n\n==== Running PolicyFactory test\n"; diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl index 94f910887e6..162acd63c17 100755 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl @@ -13,7 +13,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("server", "-o $file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $file"); +} $CL = new PerlACE::Process ("client", "-k file://$file"); print STDERR "\n\n==== Running Request_Interceptor_Flow test\n"; diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl index 51c67cc0c58..61ad42d1d01 100755 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl @@ -13,7 +13,12 @@ $file = PerlACE::LocalFile ("test.ior"); unlink $file; -$SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-ORBobjrefstyle url -o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file"); +} $CL = new PerlACE::Process ("client", "-ORBobjrefstyle url -f file://$file"); print STDERR "\n\n==== Running interceptor test\n"; diff --git a/TAO/tests/Queued_Message_Test/run_test.pl b/TAO/tests/Queued_Message_Test/run_test.pl index 200d88b4141..20eafcf51bd 100755 --- a/TAO/tests/Queued_Message_Test/run_test.pl +++ b/TAO/tests/Queued_Message_Test/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; $status = 0; -$T = new PerlACE::Process ("Queued_Message_Test"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Queued_Message_Test"); +} +else { + $T = new PerlACE::Process ("Queued_Message_Test"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl index aaab606acd8..489c269d6be 100755 --- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl +++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl @@ -38,8 +38,13 @@ if ($^O eq "hpux") { "-b bands.hpux"; } -$SV = new PerlACE::Process ("server", $server_args); -$CL = new PerlACE::Process ("client"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", $server_args); +} +else { + $SV = new PerlACE::Process ("server", $server_args); +} +$CL = new PerlACE::Process ("client", "-n file://$iorfile1 -o file://$iorfile2"); $SV->Spawn(); if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) diff --git a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl index e6742be8d8e..1f218402506 100755 --- a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl +++ b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl @@ -16,7 +16,12 @@ unlink $iorfile; print STDERR "\n RTCORBA CLIENT_PROPAGATED Priority Unit Test\n\n"; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", , "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", , "-o $iorfile"); +} $CL = new PerlACE::Process ("client", "-k file://$iorfile"); $SV->Spawn (); diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl index 383da124db0..353569681aa 100755 --- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl +++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl @@ -20,21 +20,30 @@ print STDERR "\n********** RTCORBA Client Protocol Policy Unit Test\n\n"; # Arguments are platform-dependent (UIOP not available on Windows). $server_args = - "-s $iorfile1 -c $iorfile2 -p 1413566208 " - ."-ORBendpoint iiop:// -ORBendpoint shmiop:// -ORBEndpoint uiop:// "; + (PerlACE::is_vxworks_test() ? "" : (($^O eq "MSWin32") ? "-p 1413566210 " : "-p 1413566208 ")) + ."-ORBendpoint iiop:// " + .(PerlACE::is_vxworks_test() ? "" : "-ORBendpoint shmiop:// ") + .(($^O eq "MSWin32") ? "" : "-ORBEndpoint uiop:// "); $client_args = - "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 1 "; - -if ($^O eq "MSWin32") { - $server_args = - "-s $iorfile1 -c $iorfile2 -p 1413566210 " - ."-ORBendpoint iiop:// -ORBendpoint shmiop:// "; - $client_args = - "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1"; -} + "-s file://$iorfile1 -c file://$iorfile2 " + .(($^O eq "MSWin32") ? "" : "-p 1413566210 ") + ."-ORBdebuglevel 1 "; + +#if ($^O eq "MSWin32") { +# $server_args = +# "-p 1413566210 " +# ."-ORBendpoint iiop:// -ORBendpoint shmiop:// "; +# $client_args = +# "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1"; +#} # Start server. -$SV = new PerlACE::Process ("server", $server_args); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-s test1.ior -c test2.ior $server_args"); +} +else { + $SV = new PerlACE::Process ("server", "-s $iorfile1 -c $iorfile2 $server_args"); +} $CL = new PerlACE::Process ("client", $client_args); $SV->Spawn (); diff --git a/TAO/tests/RTCORBA/Collocation/run_test.pl b/TAO/tests/RTCORBA/Collocation/run_test.pl index 7ea04278c24..d8e8bcc985b 100755 --- a/TAO/tests/RTCORBA/Collocation/run_test.pl +++ b/TAO/tests/RTCORBA/Collocation/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; print STDERR "\n********** RTCORBA Collocation Unit Test **********\n\n"; -$T = new PerlACE::Process ("Collocation"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Collocation"); +} +else { + $T = new PerlACE::Process ("Collocation"); +} $test = $T->SpawnWaitKill(60); if ($test == 2) { diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl index d04d0035c73..25ccc3504f6 100755 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; print STDERR "\n********** RTCORBA Destroy_Thread_Pool Unit Test **********\n\n"; -$T = new PerlACE::Process ("Destroy_Thread_Pool"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Destroy_Thread_Pool"); +} +else { + $T = new PerlACE::Process ("Destroy_Thread_Pool"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl index 564403b0c67..b5aa193758d 100755 --- a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl @@ -9,7 +9,7 @@ use lib '../../../../bin'; use PerlACE::Run_Test; $status = 0; -$iorfile = "ior"; +$iorfile = PerlACE::LocalFile("ior"); @configurations = ( @@ -61,7 +61,8 @@ $iorfile = "ior"; sub run_client { - $CL = new PerlACE::Process ("client", @_); + my $arg = shift; + $CL = new PerlACE::Process ("client", "-k file://$iorfile " . $arg); $CL->Spawn (); @@ -77,7 +78,12 @@ sub run_client sub run_server { - $SV = new PerlACE::Process ("server", @_); + if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", @_); + } + else { + $SV = new PerlACE::Process ("server", @_); + } $SV->Spawn (); if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl index af580051506..ba40eab7c7d 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl @@ -43,14 +43,20 @@ unlink $iorfile; unlink $data_file; $server_args = - "-o $iorfile -ORBdebuglevel $debug_level " - ."-ORBendpoint iiop:// -ORBendpoint shmiop:// "; + "-ORBdebuglevel $debug_level " + ."-ORBendpoint iiop:// " + .(PerlACE::is_vxworks_test() ? "" : "-ORBendpoint shmiop:// "); $client_args = "-o file://$iorfile " ."-a $priority1 -b $priority2 -e 1413566210 -f 0 -n $iterations"; -$SV = new PerlACE::Process ("server", $server_args); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior $server_args"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile $server_args"); +} $CL = new PerlACE::Process ("client", $client_args); print STDERR "\n********** MT Client Protocol & CLIENT_PROPAGATED combo Test\n\n"; diff --git a/TAO/tests/RTCORBA/ORB_init/run_test.pl b/TAO/tests/RTCORBA/ORB_init/run_test.pl index 0d351700807..356ff8edb52 100755 --- a/TAO/tests/RTCORBA/ORB_init/run_test.pl +++ b/TAO/tests/RTCORBA/ORB_init/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; print STDERR "\n********** RTCORBA ORB_init Unit Test **********\n\n"; -$T = new PerlACE::Process ("ORB_init"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("ORB_init"); +} +else { + $T = new PerlACE::Process ("ORB_init"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl index 08a8fed4db6..c7abccc3a34 100755 --- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl +++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl @@ -27,12 +27,16 @@ $extra_server_args = "-d 1 -ORBobjrefstyle url -ORBEndpoint iiop://1.0\@:$iiop_p { iorfiles => [ "persistent_ior", "tp_persistent_ior", "transient_ior" ], server => "-a tp_persistent_ior -p persistent_ior -t transient_ior $extra_server_args", - clients => [ "-k file://tp_persistent_ior", "-k file://persistent_ior", "-k file://transient_ior -x" ], + clients => [ "-k file://".PerlACE::LocalFile("tp_persistent_ior"), + "-k file://".PerlACE::LocalFile("persistent_ior"), + "-k file://".PerlACE::LocalFile("transient_ior")." -x" ], }, { iorfiles => [ "not_used_ior_1", "not_used_ior_2", "transient_ior" ], server => "-a not_used_ior_1 -p not_used_ior_2 -t transient_ior $extra_server_args", - clients => [ "-k file://tp_persistent_ior", "-k file://persistent_ior", "-k file://transient_ior -x" ], + clients => [ "-k file://".PerlACE::LocalFile("tp_persistent_ior"), + "-k file://".PerlACE::LocalFile("persistent_ior"), + "-k file://".PerlACE::LocalFile("transient_ior")." -x" ], }, ); @@ -62,7 +66,12 @@ sub run_server print "\nRunning server with the following args: $args\n\n"; - $SV = new PerlACE::Process ("server", $args); + if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", $args); + } + else { + $SV = new PerlACE::Process ("server", $args); + } $SV->Spawn (); diff --git a/TAO/tests/RTCORBA/Policies/run_test.pl b/TAO/tests/RTCORBA/Policies/run_test.pl index 23ab04cd393..8c87f1f6805 100755 --- a/TAO/tests/RTCORBA/Policies/run_test.pl +++ b/TAO/tests/RTCORBA/Policies/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; -$T = new PerlACE::Process ("Policies"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("Policies"); +} +else { + $T = new PerlACE::Process ("Policies"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl index 3a8932a1c53..1f0077fcdd8 100755 --- a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl +++ b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl @@ -49,11 +49,17 @@ for $file (@iorfiles) unlink $file; } -$SV = new PerlACE::Process ("server"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server"); +} +else { + $SV = new PerlACE::Process ("server"); +} $SV->Spawn (); for $file (@iorfiles) { + $file = PerlACE::LocalFile($file); if (PerlACE::waitforfile_timed ($file, 10) == -1) { $server = $SV->TimedWait (1); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl index f487eb5eddb..d30f64811a0 100755 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl @@ -40,13 +40,18 @@ sub run_test { for $test (@configurations) { - unlink $test->{file}; + unlink PerlACE::LocalFile($test->{file}); } my @parms = @_; $arg = $parms[0]; - $SV = new PerlACE::Process ("server", "-s $server_static_threads -d $server_dynamic_threads"); + if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-s $server_static_threads -d $server_dynamic_threads"); + } + else { + $SV = new PerlACE::Process ("server", "-s $server_static_threads -d $server_dynamic_threads"); + } $server = $SV->Spawn (); if ($server == -1) { @@ -55,7 +60,7 @@ sub run_test for $test (@configurations) { - if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1) + if (PerlACE::waitforfile_timed (PerlACE::LocalFile($test->{file}), 10) == -1) { $server = $SV->TimedWait (1); if ($server == 2) @@ -71,6 +76,7 @@ sub run_test goto kill_server; } } + print $test->{file}."\n"; } $CL[$i] = new PerlACE::Process ("client", $arg); @@ -96,7 +102,7 @@ sub run_test for $test (@configurations) { - unlink $test->{file}; + unlink PerlACE::LocalFile($test->{file}); } } @@ -106,7 +112,8 @@ for $test (@configurations) print STDERR "$test->{description}\n"; print STDERR "*************************************************************\n\n"; - run_test ("-k file://$test->{file} $test->{args}"); + my $file = PerlACE::LocalFile($test->{file}); + run_test ("-k file://$file $test->{args}"); } exit $status diff --git a/TAO/tests/RTCORBA/Private_Connection/run_test.pl b/TAO/tests/RTCORBA/Private_Connection/run_test.pl index a828a6220d6..537c5b0fca6 100755 --- a/TAO/tests/RTCORBA/Private_Connection/run_test.pl +++ b/TAO/tests/RTCORBA/Private_Connection/run_test.pl @@ -18,7 +18,12 @@ unlink $iorfile2; print STDERR "\n********** RTCORBA Private Connection Unit Test\n\n"; -$SV = new PerlACE::Process ("server", "-o $iorfile1 -p $iorfile2"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test1.ior -p test2.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile1 -p $iorfile2"); +} $CL = new PerlACE::Process ("client", "-o file://$iorfile1 -p file://$iorfile2 -ORBdebuglevel 3 "); $SV->Spawn (); diff --git a/TAO/tests/RTCORBA/RTMutex/run_test.pl b/TAO/tests/RTCORBA/RTMutex/run_test.pl index e123f4ea033..c8815f69464 100755 --- a/TAO/tests/RTCORBA/RTMutex/run_test.pl +++ b/TAO/tests/RTCORBA/RTMutex/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; print STDERR "\n********** RTCORBA RTMutex Unit Test **********\n\n"; -$T = new PerlACE::Process ("server"); +if (PerlACE::is_vxworks_test()) { + $T = new PerlACE::ProcessVX ("server"); +} +else { + $T = new PerlACE::Process ("server"); +} $test = $T->SpawnWaitKill (60); diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl index 37d8318df43..04c75bb3b3f 100755 --- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl @@ -16,26 +16,30 @@ unlink $iorfile2; $status = 0; $server_args = - "-p $iorfile1 -o $iorfile2 -a 45 -b 55"; + "-a 45 -b 55"; print STDERR "Value is " . $^O; if ($^O eq "MSWin32") { $server_args = - "-p $iorfile1 -o $iorfile2 -a 1 -b 2"; + "-a 1 -b 2"; } elsif ($^O eq "dec_osf") { $server_args = - "-p $iorfile1 -o $iorfile2 -a 20 -b 30"; + "-a 20 -b 30"; } elsif ($^O eq "hpux") { $server_args = - "-p $iorfile1 -o $iorfile2 -a 17 -b 29"; + "-a 17 -b 29"; } $client_args = "-p file://$iorfile1 -o file://$iorfile2"; -print STDERR "server $server_args\n"; -$SV = new PerlACE::Process ("server", $server_args); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-p test1.ior -o test2.ior $server_args"); +} +else { + $SV = new PerlACE::Process ("server", "-p $iorfile1 -o $iorfile2 $server_args"); +} $CL = new PerlACE::Process ("client", $client_args); print STDERR "\n********** RTCORBA SERVER_DECLARED Priority Unit Test\n\n"; diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl index 58e94e40b60..568383dfa70 100755 --- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl @@ -56,7 +56,12 @@ sub run_clients } } -$SV = new PerlACE::Process ("server"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server"); +} +else { + $SV = new PerlACE::Process ("server"); +} $SV->Spawn (); @@ -86,14 +91,14 @@ for $test (@configurations) print STDERR "$test->{description}\n"; print STDERR "*************************************************************\n\n"; - run_clients ("-k file://$test->{file}", $number_of_clients); + run_clients ("-k file://".PerlACE::LocalFile($test->{file}), $number_of_clients); } print STDERR "\n************************\n"; print STDERR "Shutting down the server\n"; print STDERR "************************\n\n"; -run_clients ("-k file://$configurations[0]->{file} -i 0 -x", 1); +run_clients ("-k file://".PerlACE::LocalFile($configurations[0]->{file})." -i 0 -x", 1); kill_server: diff --git a/TAO/tests/RTScheduling/Current/run_test.pl b/TAO/tests/RTScheduling/Current/run_test.pl index 74e5d5d0895..b8673381da4 100755 --- a/TAO/tests/RTScheduling/Current/run_test.pl +++ b/TAO/tests/RTScheduling/Current/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; $status = 0; -$CL = new PerlACE::Process ("Current", ""); +if (PerlACE::is_vxworks_test()) { + $CL = new PerlACE::ProcessVX ("Current"); +} +else { + $CL = new PerlACE::Process ("Current"); +} print STDERR "Starting Current Test\n"; diff --git a/TAO/tests/RTScheduling/DT_Spawn/run_test.pl b/TAO/tests/RTScheduling/DT_Spawn/run_test.pl index 82543832db9..6d0b579fe3b 100755 --- a/TAO/tests/RTScheduling/DT_Spawn/run_test.pl +++ b/TAO/tests/RTScheduling/DT_Spawn/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; $status = 0; -$CL = new PerlACE::Process ("DT_Spawn", ""); +if (PerlACE::is_vxworks_test()) { + $CL = new PerlACE::ProcessVX ("DT_Spawn"); +} +else { + $CL = new PerlACE::Process ("DT_Spawn"); +} print STDERR "Starting Current Test\n"; diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl index a98ecea7e6e..2f3e20805c6 100755 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl @@ -12,15 +12,27 @@ use PerlACE::Run_Test; $sleeptime = 2; $status = 0; +$iorfile = PerlACE::LocalFile("test.ior"); -$SV = new PerlACE::Process ("Scheduler_Interceptor_Server", "-f test.ior"); -$CL = new PerlACE::Process ("Scheduler_Interceptor_Client", "-f test.ior"); +unlink $iorfile; + +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("Scheduler_Interceptor_Server", "-f test.ior"); +} +else { + $SV = new PerlACE::Process ("Scheduler_Interceptor_Server", "-f test.ior"); +} +$CL = new PerlACE::Process ("Scheduler_Interceptor_Client", "-f $iorfile"); print STDERR "Starting Server\n"; $SV->Spawn (); -sleep $sleeptime; +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; +} print STDERR "Starting Client\n"; diff --git a/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl b/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl index 5ada18e5e36..7cef3fc4eef 100755 --- a/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl +++ b/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; $status = 0; -$CL = new PerlACE::Process ("Thread_Cancel", ""); +if (PerlACE::is_vxworks_test()) { + $CL = new PerlACE::ProcessVX ("Thread_Cancel"); +} +else { + $CL = new PerlACE::Process ("Thread_Cancel"); +} print STDERR "Starting Current Test\n"; diff --git a/TAO/tests/RTScheduling/VoidData/run_test.pl b/TAO/tests/RTScheduling/VoidData/run_test.pl index 4ac511bcbdd..ad6f3662a0e 100755 --- a/TAO/tests/RTScheduling/VoidData/run_test.pl +++ b/TAO/tests/RTScheduling/VoidData/run_test.pl @@ -10,7 +10,12 @@ use PerlACE::Run_Test; $status = 0; -$CL = new PerlACE::Process ("VoidData", ""); +if (PerlACE::is_vxworks_test()) { + $CL = new PerlACE::ProcessVX ("VoidData"); +} +else { + $CL = new PerlACE::Process ("VoidData"); +} print STDERR "Starting Current Test\n"; diff --git a/TAO/tests/Reliable_Oneways/run_test.pl b/TAO/tests/Reliable_Oneways/run_test.pl index db835ad5a28..c762b9f4a58 100755 --- a/TAO/tests/Reliable_Oneways/run_test.pl +++ b/TAO/tests/Reliable_Oneways/run_test.pl @@ -13,7 +13,12 @@ unlink $iorfile; $status = 0; foreach $i ("-n", "-t", "-s", "-r") { - $SV = new PerlACE::Process ("server", "-o $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 $i"); $SV->Spawn (); diff --git a/TAO/tests/Sequence_Unit_Tests/run_test.pl b/TAO/tests/Sequence_Unit_Tests/run_test.pl index c6fd1ae795f..a7c4c540e91 100755 --- a/TAO/tests/Sequence_Unit_Tests/run_test.pl +++ b/TAO/tests/Sequence_Unit_Tests/run_test.pl @@ -27,14 +27,27 @@ my @tests = qw(unbounded_value_sequence_ut foreach my $process (@tests) { - - my $P = new PerlACE::Process ($process, + + my $P = 0; + if (PerlACE::is_vxworks_test()) { + $P = new PerlACE::ProcessVX ($process, + '--log_level=nothing ' + .'--report_level=no'); + } + else { + $P = new PerlACE::Process ($process, '--log_level=nothing ' .'--report_level=no'); + } my $executable = $P->Executable; # Not all the binaries are generated in all configurations. - next unless -x $executable; + if (PerlACE::is_vxworks_test()) { + next unless -e $executable; + } + else { + next unless -x $executable; + } print "Running $process ..."; my $result = $P->Spawn; diff --git a/TAO/tests/Servant_To_Reference_Test/run_test.pl b/TAO/tests/Servant_To_Reference_Test/run_test.pl index dcae6d38fb7..dd868e17e78 100755 --- a/TAO/tests/Servant_To_Reference_Test/run_test.pl +++ b/TAO/tests/Servant_To_Reference_Test/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $SV->Spawn (); diff --git a/TAO/tests/Server_Leaks/run_test.pl b/TAO/tests/Server_Leaks/run_test.pl index 9874383b15f..78d7361b657 100755 --- a/TAO/tests/Server_Leaks/run_test.pl +++ b/TAO/tests/Server_Leaks/run_test.pl @@ -25,7 +25,12 @@ if (defined $opt_i) { $iterations = $opt_i; } -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o server.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $SV->Spawn (); diff --git a/TAO/tests/Single_Read/run_test.pl b/TAO/tests/Single_Read/run_test.pl index 52eec41c8ff..fc73e785a63 100755 --- a/TAO/tests/Single_Read/run_test.pl +++ b/TAO/tests/Single_Read/run_test.pl @@ -8,12 +8,17 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../bin"; use PerlACE::Run_Test; -$iorfile = PerlACE::LocalFile ("ior"); +$iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 -d 10 -i 10 -x"); $SV->Spawn (); diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl index 11eea576ded..9ce35f6d854 100755 --- a/TAO/tests/Smart_Proxies/run_test.pl +++ b/TAO/tests/Smart_Proxies/run_test.pl @@ -13,7 +13,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $iorfile"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile"); +} $CL = new PerlACE::Process ("client", "-i file://$iorfile"); print STDERR "\nrunning Smart Proxy test consisting of the client and the server\n\n"; diff --git a/TAO/tests/Stack_Recursion/run_test.pl b/TAO/tests/Stack_Recursion/run_test.pl index e35136b50e0..c6269677c1d 100755 --- a/TAO/tests/Stack_Recursion/run_test.pl +++ b/TAO/tests/Stack_Recursion/run_test.pl @@ -14,7 +14,12 @@ unlink $iorfile; unlink (@files); $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 (); diff --git a/TAO/tests/Timed_Buffered_Oneways/run_test.pl b/TAO/tests/Timed_Buffered_Oneways/run_test.pl index c2c3e986c6d..b533838ee93 100755 --- a/TAO/tests/Timed_Buffered_Oneways/run_test.pl +++ b/TAO/tests/Timed_Buffered_Oneways/run_test.pl @@ -8,12 +8,17 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "../../../bin"; use PerlACE::Run_Test; -$iorfile = PerlACE::LocalFile ("ior"); +$iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $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 -x"); $SV->Spawn (); diff --git a/TAO/tests/Timeout/run_test.pl b/TAO/tests/Timeout/run_test.pl index efe8e9910fd..dd503620fd3 100755 --- a/TAO/tests/Timeout/run_test.pl +++ b/TAO/tests/Timeout/run_test.pl @@ -13,7 +13,12 @@ $status = 0; $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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", "-ORBDebugLevel 0 -k file://$iorfile -l 2 -h 28"); diff --git a/TAO/tests/Two_Objects/run_test.pl b/TAO/tests/Two_Objects/run_test.pl index 283879c9611..9cb6615c5a4 100755 --- a/TAO/tests/Two_Objects/run_test.pl +++ b/TAO/tests/Two_Objects/run_test.pl @@ -12,7 +12,12 @@ $iorfile = PerlACE::LocalFile ("test.ior"); unlink $iorfile; $status = 0; -$SV = new PerlACE::Process ("server", "-o $iorfile -t 10 -l 100000"); +if (PerlACE::is_vxworks_test()) { + $SV = new PerlACE::ProcessVX ("server", "-o test.ior -t 10 -l 100000"); +} +else { + $SV = new PerlACE::Process ("server", "-o $iorfile -t 10 0l 100000"); +} $CL = new PerlACE::Process ("client", " -r file://$iorfile"); $SV->Spawn (); diff --git a/TAO/tests/Typedef_String_Array/run_test.pl b/TAO/tests/Typedef_String_Array/run_test.pl index 26698f97514..d2391bbf584 100755 --- a/TAO/tests/Typedef_String_Array/run_test.pl +++ b/TAO/tests/Typedef_String_Array/run_test.pl @@ -14,7 +14,12 @@ $iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ('server', "-o $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 (); diff --git a/TAO/tests/UNKNOWN_Exception/run_test.pl b/TAO/tests/UNKNOWN_Exception/run_test.pl index 2c3c0f5f59e..9334b4edbd4 100755 --- a/TAO/tests/UNKNOWN_Exception/run_test.pl +++ b/TAO/tests/UNKNOWN_Exception/run_test.pl @@ -9,11 +9,16 @@ use lib '../../../bin'; use PerlACE::Run_Test; $status = 0; -$iorfile = PerlACE::LocalFile ("ior"); +$iorfile = PerlACE::LocalFile ("server.ior"); unlink $iorfile; -$SV = new PerlACE::Process ("server", "-o $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 -x 1"); $SV->Spawn (); |