diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2015-01-14 09:03:16 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2015-01-14 09:03:16 +0000 |
| commit | f7a5893f80efb3e9aa0428ccdea5f589ee150536 (patch) | |
| tree | 0eb8cb2a0cf5b62213823100494440400ab537f9 /webrtc | |
| parent | ef090927f48bc9144be6b724df69c2c09119766e (diff) | |
| download | webrtc-f7a5893f80efb3e9aa0428ccdea5f589ee150536.tar.gz | |
Combine RegKeyTests to prevent parallel execution.
Executing these tests in parallel causes failures due to conflicting
registry keys, combining them to unblock launching a parallel win32 bot.
Ideally these keys would be generated differently per-process and not
conflict at all (so it can be run in parallel repeatedly alongside itself).
BUG=4162
R=kjellander@webrtc.org
TBR=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36749004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8055 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc')
| -rw-r--r-- | webrtc/base/win32regkey_unittest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/webrtc/base/win32regkey_unittest.cc b/webrtc/base/win32regkey_unittest.cc index 1e77381820..d26305147f 100644 --- a/webrtc/base/win32regkey_unittest.cc +++ b/webrtc/base/win32regkey_unittest.cc @@ -169,7 +169,7 @@ TEST(RegKeyTest, RegKeyHelperFunctionsTest) { RegKeyHelperFunctionsTest(); } -TEST(RegKeyTest, RegKeyNonStaticFunctionsTest) { +void RegKeyNonStaticFunctionsTest() { DWORD int_val = 0; DWORD64 int64_val = 0; wchar_t* str_val = NULL; @@ -359,7 +359,7 @@ TEST(RegKeyTest, RegKeyNonStaticFunctionsTest) { EXPECT_SUCCEEDED(RegKey::DeleteKey(kFullRkey1)); } -TEST(RegKeyTest, RegKeyStaticFunctionsTest) { +void RegKeyStaticFunctionsTest() { DWORD int_val = 0; DWORD64 int64_val = 0; float float_val = 0; @@ -587,4 +587,11 @@ TEST(RegKeyTest, RegKeyStaticFunctionsTest) { EXPECT_SUCCEEDED(RegKey::DeleteKey(kFullRkey1)); } +// Run both tests under the same test target. Because they access (read and +// write) the same registry keys they can't run in parallel with eachother. +TEST(RegKeyTest, RegKeyFunctionsTest) { + RegKeyNonStaticFunctionsTest(); + RegKeyStaticFunctionsTest(); +} + } // namespace rtc |