diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2008-01-17 20:06:33 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2008-01-17 20:06:33 +0000 |
| commit | 0670ae9645976e3e571116450046912a84814996 (patch) | |
| tree | a29a84430f4bbba95b31768c1053e04d854dec1e | |
| parent | 88e74e3b5f30f6a3d10551b0b4a80c6f03fe677b (diff) | |
| download | ATCD-0670ae9645976e3e571116450046912a84814996.tar.gz | |
ChangeLogTag: Thu Jan 17 20:02:43 UTC 2008 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl | 2 | ||||
| -rwxr-xr-x | TAO/tests/Bug_3154_Regression/run_test.pl | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6b8617cb144..12c5d4736f3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Jan 17 20:02:43 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl: + * tests/Bug_3154_Regression/run_test.pl: + + Fixed tests that assumed $TAO_ROOT was $ACE_ROOT/TAO. + Wed Jan 16 19:39:58 UTC 2008 Adam Mitz <mitza@ociweb.com> * tao/Transport.cpp: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl index 7d11fc17d8c..bff7dd8e2c4 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl @@ -45,7 +45,7 @@ if (PerlACE::waitforfile_timed ($iorfile, exit 1; } -$LOADER = new PerlACE::Process ("../../../../../bin/tao_ifr", +$LOADER = new PerlACE::Process ("$PerlACE::ACE_ROOT/bin/tao_ifr", "-ORBInitRef InterfaceRepository=file://$iorfile test.idl"); print STDERR "Loading test.idl into IFR service\n"; $status = $LOADER->SpawnWaitKill (15); diff --git a/TAO/tests/Bug_3154_Regression/run_test.pl b/TAO/tests/Bug_3154_Regression/run_test.pl index f9d5cc3747b..a959bd1cce7 100755 --- a/TAO/tests/Bug_3154_Regression/run_test.pl +++ b/TAO/tests/Bug_3154_Regression/run_test.pl @@ -8,15 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; -# The location of the tao_idl utility - depends on O/S -if ($^O eq "MSWin32") -{ - $tao_idl = "../../../bin/tao_idl"; -} -else -{ - $tao_idl = "../../../TAO/TAO_IDL/tao_idl"; -} +$tao_idl = "$PerlACE::ACE_ROOT/bin/tao_idl"; # IDL file names $idl_file = PerlACE::LocalFile ("test.idl"); |