diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile')
3 files changed, 17 insertions, 20 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h index 08d558dc82b..18ff8ec8671 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h @@ -6,12 +6,12 @@ #include "ace/Get_Opt.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" class FTP_Client_Callback; class FTP_Client_Producer diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl index bbc47d41b8a..c168a476ea7 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl @@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../../bin'; use PerlACE::Run_Test; -use File::stat; # amount of delay between running the servers @@ -17,16 +16,14 @@ $status = 0; $nsior = PerlACE::LocalFile ("ns.ior"); $test1 = PerlACE::LocalFile ("test1"); $test2 = PerlACE::LocalFile ("test2"); - -# generate test stream data -$input = PerlACE::generate_test_file("test_input", 102400); +$makefile = PerlACE::LocalFile ("Makefile"); unlink $nsior, $test1, $test2; $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior"); $SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1"); $SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2"); -$CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $input"); +$CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $makefile"); print STDERR "Starting Naming Service\n"; @@ -34,7 +31,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } @@ -80,6 +77,6 @@ if ($nserver != 0) { $status = 1; } -unlink $nsior, $test1, $test2, $input; +unlink $nsior, $test1, $test2; exit $status; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index b292ff910e5..ac21c891ced 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -2,13 +2,13 @@ // $Id$ #include "ace/Get_Opt.h" -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/AV/Flows_T.h" -#include "orbsvcs/AV/sfp.h" -#include "orbsvcs/AV/MCast.h" -#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/orbsvcs/AV/Flows_T.h" +#include "orbsvcs/orbsvcs/AV/sfp.h" +#include "orbsvcs/orbsvcs/AV/MCast.h" +#include "orbsvcs/orbsvcs/AV/Policy.h" class FTP_Server_Callback :public TAO_AV_Callback |