Bug 996238 - Reformat gtest_utils.h. r=ekr

This commit is contained in:
Martin Thomson 2015-04-01 11:21:06 -07:00
parent ae40046d93
commit c792a525fe

View File

@ -51,36 +51,36 @@
// Wait up to timeout seconds for expression to be true
#define WAIT(expression, timeout) \
do { \
for (PRIntervalTime start = PR_IntervalNow(); !(expression) && \
! ((PR_IntervalNow() - start) > PR_MillisecondsToInterval(timeout));) \
PR_Sleep(10); \
for (PRIntervalTime start = PR_IntervalNow(); !(expression) && \
! ((PR_IntervalNow() - start) > PR_MillisecondsToInterval(timeout));) { \
PR_Sleep(10); \
} \
} while(0)
// Same as GTEST_WAIT, but stores the result in res. Used when
// you also want the result of expression but wish to avoid
// double evaluation.
#define WAIT_(expression, timeout, res) \
#define WAIT_(expression, timeout, res) \
do { \
for (PRIntervalTime start = PR_IntervalNow(); !(res = (expression)) && \
! ((PR_IntervalNow() - start) > PR_MillisecondsToInterval(timeout));) \
PR_Sleep(10); \
for (PRIntervalTime start = PR_IntervalNow(); !(res = (expression)) && \
! ((PR_IntervalNow() - start) > PR_MillisecondsToInterval(timeout));) { \
PR_Sleep(10); \
} \
} while(0)
#define ASSERT_TRUE_WAIT(expression, timeout) \
do { \
bool res; \
WAIT_(expression, timeout, res); \
ASSERT_TRUE(res); \
} while(0);
bool res; \
WAIT_(expression, timeout, res); \
ASSERT_TRUE(res); \
} while(0)
#define EXPECT_TRUE_WAIT(expression, timeout) \
do { \
bool res; \
WAIT_(expression, timeout, res); \
EXPECT_TRUE(res); \
} while(0);
bool res; \
WAIT_(expression, timeout, res); \
EXPECT_TRUE(res); \
} while(0)
#endif