Updates ADB stress test code to support Windowsbot
ADB stress is to be set up on Windows bot, as well as the already
existing Linux and Mac. This checkin is to add the new windws bot to
the builders.pyl file, as well as to fix a small issue in the adb.py
recipe itself.
Change-Id: I079f02339fdb3f0670e24175cf4b74296af6f381
diff --git a/build/masters/master.client.adt/builders.pyl b/build/masters/master.client.adt/builders.pyl
index 41fa6a9..960e42f 100644
--- a/build/masters/master.client.adt/builders.pyl
+++ b/build/masters/master.client.adt/builders.pyl
@@ -380,6 +380,12 @@
"categories": ["ADB"],
"tag": "Mac",
},
+ "Win 10 Intel HD 4400": {
+ "recipe": "adt/adb",
+ "slave_pools": ["win-10-intel-hd-4400"],
+ "categories": ["ADB"],
+ "tag": "Win",
+ },
},
"schedulers": {
@@ -443,6 +449,14 @@
},
"slaves": ['chromeos1-row3-rack4-host3'],
},
+ "win-10-intel-hd-4400": {
+ "slave_data": {
+ "bits": 64,
+ "os": "win",
+ "version": "trusty",
+ },
+ "slaves": ['chromeos1-row3-rack4-host4'],
+ },
"ubuntu-14_04-intel-hd-4400": {
"slave_data": {
"bits": 64,
diff --git a/build/scripts/slave/recipes/adt/adb.py b/build/scripts/slave/recipes/adt/adb.py
index 22927c8..807cb87 100644
--- a/build/scripts/slave/recipes/adt/adb.py
+++ b/build/scripts/slave/recipes/adt/adb.py
@@ -29,6 +29,8 @@
android_sdk_home = api.path.join(os.path.expanduser('~'), 'Android', 'android-sdk-linux_public')
elif api.platform.is_mac:
android_sdk_home = api.path.join(os.path.expanduser('~'), 'Android', 'android-sdk-macosx_public')
+ elif api.platform.is_win:
+ android_sdk_home = api.path.join(os.path.expanduser('~'), 'Android', 'android-sdk_public')
platform_tools_dir = api.path.join(android_sdk_home, 'platform-tools')
env_path = ['%(PATH)s', platform_tools_dir]
env = {'PATH': api.path.pathsep.join(env_path)}
