summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-28 15:36:48 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-28 15:36:48 +0000
commit755ce9423f142d6c4126d2d4c73b829052b6aa3c (patch)
treea5f5ed72a3aa1ecd6da69c7409427f82230f9fb8
parent6c241dd43978e25a9ebf94ea5ab70250bf412e62 (diff)
downloadATCD-755ce9423f142d6c4126d2d4c73b829052b6aa3c.tar.gz
ChangeLogTag: Fri Jul 28 10:34:01 2000 David L. Levine <levine@cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--tests/Semaphore_Test.cpp8
4 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb4046a52f3..22407747e18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 28 10:34:01 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * test/Semaphore_Test.cpp (ACE_ALLOWED_SLACK): set
+ to 1100 if ACE isn't using a high resolution timer,
+ such as on LynxOS/PPC.
+
Fri Jul 28 10:23:03 2000 David L. Levine <levine@cs.wustl.edu>
* Makefile (DIRS, CLONE, CONTROLLED_FILES, RELEASE_LIB_FILES):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index bb4046a52f3..22407747e18 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Jul 28 10:34:01 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * test/Semaphore_Test.cpp (ACE_ALLOWED_SLACK): set
+ to 1100 if ACE isn't using a high resolution timer,
+ such as on LynxOS/PPC.
+
Fri Jul 28 10:23:03 2000 David L. Levine <levine@cs.wustl.edu>
* Makefile (DIRS, CLONE, CONTROLLED_FILES, RELEASE_LIB_FILES):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bb4046a52f3..22407747e18 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Fri Jul 28 10:34:01 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * test/Semaphore_Test.cpp (ACE_ALLOWED_SLACK): set
+ to 1100 if ACE isn't using a high resolution timer,
+ such as on LynxOS/PPC.
+
Fri Jul 28 10:23:03 2000 David L. Levine <levine@cs.wustl.edu>
* Makefile (DIRS, CLONE, CONTROLLED_FILES, RELEASE_LIB_FILES):
diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp
index 49cd5b7b382..191abd3285f 100644
--- a/tests/Semaphore_Test.cpp
+++ b/tests/Semaphore_Test.cpp
@@ -26,7 +26,13 @@
ACE_RCSID(tests, Semaphore_Test, "$Id$")
// msec that times are allowed to differ before test fails.
-#define ACE_ALLOWED_SLACK 100
+#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \
+ defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER) || \
+ defined (ACE_HAS_POWERPC_TIMER)
+# define ACE_ALLOWED_SLACK 100
+#else /* don't have a high-res timer */
+# define ACE_ALLOWED_SLACK 1100
+#endif /* don't have a high-res timer */
// Test results, 'success' is 0
static int test_result = 0;