summaryrefslogtreecommitdiff
path: root/TAO/tests/CollocationLockup
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/CollocationLockup')
-rw-r--r--TAO/tests/CollocationLockup/CollocationLockup.cpp6
-rwxr-xr-xTAO/tests/CollocationLockup/run_test.pl5
2 files changed, 0 insertions, 11 deletions
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index b71122bc23b..ad25d7cb7bd 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -18,13 +18,7 @@
namespace
{
-#if defined (ACE_OPENVMS)
- // less threads on OpenVMS otherwise this test
- // (although working correctly) takes far too long.
- const size_t N_THREADS = 10;
-#else
const size_t N_THREADS = 20;
-#endif
const size_t N_ITERATIONS = 100;
}
diff --git a/TAO/tests/CollocationLockup/run_test.pl b/TAO/tests/CollocationLockup/run_test.pl
index 819642dfe99..0f7aacb946f 100755
--- a/TAO/tests/CollocationLockup/run_test.pl
+++ b/TAO/tests/CollocationLockup/run_test.pl
@@ -14,11 +14,6 @@ $debug_level = '0';
# 20 seconds and when the bug was fixed it returned before 20 seconds.
$timeout = 0;
-if ($^O eq "VMS") {
- # On OpenVMS this test does not lock up but takes much longer
- $timeout = 280;
-}
-
foreach $i (@ARGV) {
if ($i eq '-debug') {
$debug_level = '10';