diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-03-14 20:13:46 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-03-14 20:13:46 +0000 |
| commit | 90ab2562d28237870a088c84a354e647c1105283 (patch) | |
| tree | fd8c04dab3c0f48d10f2927f5829a7f5f6d8e541 | |
| parent | de1ab2e99419c266ca7f29bfae7176a3aa21f3a3 (diff) | |
| download | ATCD-90ab2562d28237870a088c84a354e647c1105283.tar.gz | |
ChangeLogTag: Thu Mar 14 14:13:02 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 16 | ||||
| -rw-r--r-- | TAO/tests/File_IO/server.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/Server_Leaks/client.cpp | 2 | ||||
| -rwxr-xr-x | TAO/tests/Server_Leaks/run_test.pl | 4 |
4 files changed, 27 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 129e9c33b82..7ff62819ccd 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,19 @@ +Thu Mar 14 14:13:02 2002 Chad Elliott <elliott_c@ociweb.com> + + * tests/File_IO/server.cpp: + + Destroy the POA and ORB at the end of the test. This avoids a + core dump on HP-UX 10.20. + + * tests/Server_Leaks/run_test.pl: + + Increase the wait time for server startup. Slower machines were + failing due to this. + + * tests/Server_Leaks/client.cpp: + + Switched an ACE_CHECK within a try block to an ACE_TRY_CHECK. + Thu Mar 14 12:03:21 2002 Ossama Othman <ossama@uci.edu> * tao/ClientRequestInfo_i.cpp (~TAO_ClientRequestInfo_i): diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index a68e753a6e9..8671b68face 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -194,6 +194,14 @@ main (int argc, char *argv[]) worker.thr_mgr ()->wait (); + first_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp index c8263903192..38e5686c14c 100644 --- a/TAO/tests/Server_Leaks/client.cpp +++ b/TAO/tests/Server_Leaks/client.cpp @@ -80,7 +80,7 @@ main (int argc, char *argv[]) } orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Server_Leaks/run_test.pl b/TAO/tests/Server_Leaks/run_test.pl index 2c7f9e0eb87..9874383b15f 100755 --- a/TAO/tests/Server_Leaks/run_test.pl +++ b/TAO/tests/Server_Leaks/run_test.pl @@ -29,11 +29,11 @@ $SV = new PerlACE::Process ("server", "-o $iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $count = 0; for ($i = 0; $i != $iterations; $i++) { |