Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(894)

Side by Side Diff: webrtc/base/gunit.h

Issue 1429693005: Remove WEBRTC_ANDROID from hardcoded gtest relative path usage. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_BASE_GUNIT_H_ 11 #ifndef WEBRTC_BASE_GUNIT_H_
12 #define WEBRTC_BASE_GUNIT_H_ 12 #define WEBRTC_BASE_GUNIT_H_
13 13
14 #include "webrtc/base/logging.h" 14 #include "webrtc/base/logging.h"
15 #include "webrtc/base/thread.h" 15 #include "webrtc/base/thread.h"
16 #if defined(WEBRTC_ANDROID) || defined(GTEST_RELATIVE_PATH) 16 #if defined(GTEST_RELATIVE_PATH)
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #else 18 #else
19 #include "testing/base/public/gunit.h" 19 #include "testing/base/public/gunit.h"
20 #endif 20 #endif
21 21
22 // Wait until "ex" is true, or "timeout" expires. 22 // Wait until "ex" is true, or "timeout" expires.
23 #define WAIT(ex, timeout) \ 23 #define WAIT(ex, timeout) \
24 for (uint32_t start = rtc::Time(); !(ex) && rtc::Time() < start + timeout;) \ 24 for (uint32_t start = rtc::Time(); !(ex) && rtc::Time() < start + timeout;) \
25 rtc::Thread::Current()->ProcessMessages(1); 25 rtc::Thread::Current()->ProcessMessages(1);
26 26
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } \ 78 } \
79 LOG(LS_WARNING) << "Expression " << #ex << " still not true after " << \ 79 LOG(LS_WARNING) << "Expression " << #ex << " still not true after " << \
80 timeout << "ms; waiting an additional " << margin << "ms"; \ 80 timeout << "ms; waiting an additional " << margin << "ms"; \
81 WAIT_(ex, margin, res); \ 81 WAIT_(ex, margin, res); \
82 if (!res) { \ 82 if (!res) { \
83 EXPECT_TRUE(ex); \ 83 EXPECT_TRUE(ex); \
84 } \ 84 } \
85 } while (0); 85 } while (0);
86 86
87 #endif // WEBRTC_BASE_GUNIT_H_ 87 #endif // WEBRTC_BASE_GUNIT_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698