diff options
| -rw-r--r-- | device/bluetooth/bluetooth_adapter_unittest.cc | 4 | ||||
| -rw-r--r-- | testing/buildbot/chromium.mac.json | 36 |
2 files changed, 40 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); diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 58731e9..edc9c06 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -145,6 +145,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "device_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -464,6 +470,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "device_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -783,6 +795,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "device_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -1102,6 +1120,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "device_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -1427,6 +1451,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "device_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -1746,6 +1776,12 @@ "swarming": { "can_use_on_swarming_builders": true }, + "test": "device_unittests" + }, + { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { |