widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Be More Forgiving in EXPECT_ALMOST()" into mnc-dev

Browse Source
This commit is contained in:
John "Juce" Bruce
2015-06-19 18:20:29 +00:00
committed by Android (Google) Code Review
parent b0cfa834f1 6a773e3630
commit 3efe87583d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -59,6 +59,7 @@ const int kShortSleep = 1 * kSpeedMultiplier;
const int kLongSleep = 2 * kSpeedMultiplier; const int kLongSleep = 2 * kSpeedMultiplier;
const uint32_t kDuration = 2 * kSpeedMultiplier; const uint32_t kDuration = 2 * kSpeedMultiplier;
const uint32_t kLongDuration = 5 * kSpeedMultiplier; const uint32_t kLongDuration = 5 * kSpeedMultiplier;
const uint32_t kAlmostRange = 3 * kSpeedMultiplier;
} // namespace } // namespace
namespace wvoec { namespace wvoec {
@@ -736,9 +737,9 @@ static void dump_openssl_error() {
} }
// We don't expect exact timing. // We don't expect exact timing.
#define EXPECT_ALMOST(A, B) \ #define EXPECT_ALMOST(A, B) \
EXPECT_GE(A + kSpeedMultiplier, B); \ EXPECT_GE(A + kAlmostRange, B); \
EXPECT_LE(A - kSpeedMultiplier, B); EXPECT_LE(A - kAlmostRange, B);
class Session { class Session {
public: public: