diff options
author | reillyg <reillyg@chromium.org> | 2016-02-12 18:29:32 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-13 02:30:32 +0000 |
commit | 40bbb830a0f16bb3a60e7fdbcbb7095c7ded11d2 (patch) | |
tree | 71ff561cf284593474732645ab50f01e55f234c6 /device | |
parent | 07452f600dc2be2d819e363cccb348f25977a4e5 (diff) | |
download | chromium_src-40bbb830a0f16bb3a60e7fdbcbb7095c7ded11d2.zip chromium_src-40bbb830a0f16bb3a60e7fdbcbb7095c7ded11d2.tar.gz chromium_src-40bbb830a0f16bb3a60e7fdbcbb7095c7ded11d2.tar.bz2 |
Enable device_unittests on OS X trybots.
The rule I followed here is that anywhere we run extensions_unittests we
should probably also be running device_unittests.
An additional test guard was required for a Bluetooth test that requires
support for Bluetooth Low Energy, which is not available on the swarming
bots.
BUG=None
Review URL: https://codereview.chromium.org/1698523002
Cr-Commit-Position: refs/heads/master@{#375331}
Diffstat (limited to 'device')
-rw-r--r-- | device/bluetooth/bluetooth_adapter_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc index 91bd19a..a40af0e 100644 --- a/device/bluetooth/bluetooth_adapter_unittest.cc +++ b/device/bluetooth/bluetooth_adapter_unittest.cc @@ -447,6 +447,10 @@ TEST_F(BluetoothTest, ConstructWithoutDefaultAdapter) { // TODO(scheib): Enable BluetoothTest fixture tests on all platforms. #if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) TEST_F(BluetoothTest, ConstructFakeAdapter) { + if (!PlatformSupportsLowEnergy()) { + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; + return; + } InitWithFakeAdapter(); EXPECT_EQ(adapter_->GetAddress(), kTestAdapterAddress); EXPECT_EQ(adapter_->GetName(), kTestAdapterName); |