[recipes] Fix Windows pathsep; add Windows tests
Change-Id: Ie74bc321dcd1a9150b55b36278e94acf1df34139
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/210220
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json
index 593c022..97c030d 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-arm64-Release-Android.json
@@ -3,11 +3,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/cache/work/skia/infra/bots/assets/android_ndk_windows/VERSION",
+ "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\android_ndk_windows\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -17,27 +17,27 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/cache/work/skia/bin/fetch-gn"
+ "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
- "[START_DIR]/cache/work/skia/bin/gn",
+ "[START_DIR]\\cache\\work\\skia\\bin\\gn",
"gen",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android/Release",
- "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/n\" target_cpu=\"arm64\" werror=true"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release",
+ "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]\\n\" target_cpu=\"arm64\" werror=true"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
@@ -45,12 +45,12 @@
"cmd": [
"ninja",
"-C",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android/Release"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "ninja"
},
@@ -59,8 +59,8 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-arm64-Release-Android/Release",
- "[START_DIR]/[SWARM_OUT_DIR]/out/Release"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-arm64-Release-Android\\Release",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Release"
],
"infra_step": true,
"name": "copy build products",
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
index 0851aeb..84d366a 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
@@ -3,11 +3,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION",
+ "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -17,27 +17,27 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/cache/work/skia/bin/fetch-gn"
+ "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
- "[START_DIR]/cache/work/skia/bin/gn",
+ "[START_DIR]\\cache\\work\\skia\\bin\\gn",
"gen",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug",
- "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" werror=true win_sdk=\"[START_DIR]/win_toolchain/win_sdk\" win_vc=\"[START_DIR]/win_toolchain/VC\""
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug",
+ "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\""
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
@@ -45,12 +45,12 @@
"cmd": [
"ninja",
"-C",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "ninja"
},
@@ -59,8 +59,8 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug",
- "[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug"
],
"infra_step": true,
"name": "copy build products",
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-OpenCL.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-OpenCL.json
index e4b8766..844a77b 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-OpenCL.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Debug-OpenCL.json
@@ -3,11 +3,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION",
+ "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -17,27 +17,27 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/cache/work/skia/bin/fetch-gn"
+ "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
- "[START_DIR]/cache/work/skia/bin/gn",
+ "[START_DIR]\\cache\\work\\skia\\bin\\gn",
"gen",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-OpenCL/Debug_x64",
- "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-imsvc[START_DIR]/opencl_headers\", \"-DDUMMY_clang_win_version=42\"] extra_ldflags=[\"/LIBPATH:[START_DIR]/cache/work/skia/third_party/externals/opencl-lib/3-0/lib/x86_64\"] skia_use_opencl=true target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]/win_toolchain/win_sdk\" win_vc=\"[START_DIR]/win_toolchain/VC\""
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-OpenCL\\Debug_x64",
+ "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-imsvc[START_DIR]\\\\opencl_headers\", \"-DDUMMY_clang_win_version=42\"] extra_ldflags=[\"/LIBPATH:[START_DIR]\\\\cache\\\\work\\\\skia\\\\third_party\\\\externals\\\\opencl-lib\\\\3-0\\\\lib\\\\x86_64\"] skia_use_opencl=true target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\""
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
@@ -45,12 +45,12 @@
"cmd": [
"ninja",
"-C",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-OpenCL/Debug_x64"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-OpenCL\\Debug_x64"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "ninja"
},
@@ -59,8 +59,8 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Debug-OpenCL/Debug_x64",
- "[START_DIR]/[SWARM_OUT_DIR]/out/Debug_x64"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Debug-OpenCL\\Debug_x64",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug_x64"
],
"infra_step": true,
"name": "copy build products",
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json
index fb31acd..4e2694e 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-Clang-x86_64-Release-Vulkan.json
@@ -3,11 +3,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION",
+ "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -17,27 +17,27 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/cache/work/skia/bin/fetch-gn"
+ "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
- "[START_DIR]/cache/work/skia/bin/gn",
+ "[START_DIR]\\cache\\work\\skia\\bin\\gn",
"gen",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64",
- "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_use_vulkan=true target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]/win_toolchain/win_sdk\" win_vc=\"[START_DIR]/win_toolchain/VC\""
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64",
+ "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-DDUMMY_clang_win_version=42\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_use_vulkan=true target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\""
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
@@ -45,12 +45,12 @@
"cmd": [
"ninja",
"-C",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "ninja"
},
@@ -59,8 +59,8 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86_64-Release-Vulkan/Release_x64",
- "[START_DIR]/[SWARM_OUT_DIR]/out/Release_x64"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86_64-Release-Vulkan\\Release_x64",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Release_x64"
],
"infra_step": true,
"name": "copy build products",
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug-MSRTC.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug-MSRTC.json
index 8f45645..db4387f 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug-MSRTC.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Win-MSVC-x86_64-Debug-MSRTC.json
@@ -3,27 +3,27 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/cache/work/skia/bin/fetch-gn"
+ "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
- "[START_DIR]/cache/work/skia/bin/gn",
+ "[START_DIR]\\cache\\work\\skia\\bin\\gn",
"gen",
- "[START_DIR]/cache/work/skia/out/Build-Win-MSVC-x86_64-Debug-MSRTC/Debug_x64",
- "--args=sanitize=\"MSVC\" target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]/win_toolchain/win_sdk\" win_vc=\"[START_DIR]/win_toolchain/VC\""
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-MSVC-x86_64-Debug-MSRTC\\Debug_x64",
+ "--args=sanitize=\"MSVC\" target_cpu=\"x86_64\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\""
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
@@ -31,12 +31,12 @@
"cmd": [
"ninja",
"-C",
- "[START_DIR]/cache/work/skia/out/Build-Win-MSVC-x86_64-Debug-MSRTC/Debug_x64"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-MSVC-x86_64-Debug-MSRTC\\Debug_x64"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "ninja"
},
@@ -45,8 +45,8 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[START_DIR]/cache/work/skia/out/Build-Win-MSVC-x86_64-Debug-MSRTC/Debug_x64",
- "[START_DIR]/[SWARM_OUT_DIR]/out/Debug_x64"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-MSVC-x86_64-Debug-MSRTC\\Debug_x64",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\out\\Debug_x64"
],
"infra_step": true,
"name": "copy build products",
diff --git a/infra/bots/recipe_modules/build/examples/full.py b/infra/bots/recipe_modules/build/examples/full.py
index b007295..0262d9c 100644
--- a/infra/bots/recipe_modules/build/examples/full.py
+++ b/infra/bots/recipe_modules/build/examples/full.py
@@ -6,6 +6,7 @@
DEPS = [
'build',
'recipe_engine/path',
+ 'recipe_engine/platform',
'recipe_engine/properties',
'recipe_engine/raw_io',
'run',
@@ -87,4 +88,6 @@
api.test(buildername) +
api.properties(**defaultProps(buildername))
)
+ if 'Win' in buildername and not 'LenovoYogaC630' in buildername:
+ test += api.platform('win', 64)
yield test
diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Win-Clang-x86_64-Release-ParentRevision.json b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Win-Clang-x86_64-Release-ParentRevision.json
index eea034c..341ddc6 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Win-Clang-x86_64-Release-ParentRevision.json
+++ b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Win-Clang-x86_64-Release-ParentRevision.json
@@ -3,13 +3,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cache/work"
+ "[START_DIR]\\cache\\work"
],
"infra_step": true,
"name": "makedirs checkout_path"
@@ -18,36 +18,36 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/cache/work/.gclient_entries"
+ "[START_DIR]\\cache\\work\\.gclient_entries"
],
"infra_step": true,
- "name": "remove [START_DIR]/cache/work/.gclient_entries"
+ "name": "remove [START_DIR]\\cache\\work\\.gclient_entries"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--spec-path",
- "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
+ "cache_dir = '[START_DIR]\\\\cache\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
"--patch_root",
"skia",
"--revision_mapping_file",
"{\"got_revision\": \"skia\"}",
"--git-cache-dir",
- "[START_DIR]/cache/git",
+ "[START_DIR]\\cache\\git",
"--cleanup-dir",
- "[CLEANUP]/bot_update",
+ "[CLEANUP]\\bot_update",
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123^"
],
- "cwd": "[START_DIR]/cache/work",
+ "cwd": "[START_DIR]\\cache\\work",
"env_prefixes": {
"PATH": [
"RECIPE_REPO[depot_tools]"
@@ -97,13 +97,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/tmp"
+ "[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/parent_revision_trybot.json b/infra/bots/recipe_modules/checkout/examples/full.expected/parent_revision_trybot.json
index d5b80d3..07ca9d2 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.expected/parent_revision_trybot.json
+++ b/infra/bots/recipe_modules/checkout/examples/full.expected/parent_revision_trybot.json
@@ -3,13 +3,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cache/work"
+ "[START_DIR]\\cache\\work"
],
"infra_step": true,
"name": "makedirs checkout_path"
@@ -18,36 +18,36 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/cache/work/.gclient_entries"
+ "[START_DIR]\\cache\\work\\.gclient_entries"
],
"infra_step": true,
- "name": "remove [START_DIR]/cache/work/.gclient_entries"
+ "name": "remove [START_DIR]\\cache\\work\\.gclient_entries"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--spec-path",
- "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
+ "cache_dir = '[START_DIR]\\\\cache\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
"--patch_root",
"skia",
"--revision_mapping_file",
"{\"got_revision\": \"skia\"}",
"--git-cache-dir",
- "[START_DIR]/cache/git",
+ "[START_DIR]\\cache\\git",
"--cleanup-dir",
- "[CLEANUP]/bot_update",
+ "[CLEANUP]\\bot_update",
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123"
],
- "cwd": "[START_DIR]/cache/work",
+ "cwd": "[START_DIR]\\cache\\work",
"env_prefixes": {
"PATH": [
"RECIPE_REPO[depot_tools]"
@@ -97,13 +97,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/tmp"
+ "[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
diff --git a/infra/bots/recipe_modules/checkout/examples/full.py b/infra/bots/recipe_modules/checkout/examples/full.py
index d757fb7..3d8a1e0 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.py
+++ b/infra/bots/recipe_modules/checkout/examples/full.py
@@ -7,6 +7,7 @@
'checkout',
'recipe_engine/file',
'recipe_engine/path',
+ 'recipe_engine/platform',
'recipe_engine/properties',
'run',
'vars',
@@ -62,7 +63,7 @@
def GenTests(api):
for buildername in TEST_BUILDERS:
- yield (
+ test = (
api.test(buildername) +
api.properties(buildername=buildername,
repository='https://skia.googlesource.com/skia.git',
@@ -70,6 +71,9 @@
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]')
)
+ if 'Win' in buildername and not 'LenovoYogaC630' in buildername:
+ test += api.platform('win', 64)
+ yield test
buildername = 'Build-Win-Clang-x86_64-Release-ParentRevision'
yield (
@@ -83,7 +87,8 @@
patch_set=12,
patch_ref='refs/changes/89/456789/12',
patch_repo='https://skia.googlesource.com/skia.git',
- patch_storage='gerrit')
+ patch_storage='gerrit') +
+ api.platform('win', 64)
)
buildername = 'Build-Debian9-Clang-arm-Release-Flutter_Android'
diff --git a/infra/bots/recipe_modules/flavor/default.py b/infra/bots/recipe_modules/flavor/default.py
index 6cd586d..0e988b9 100644
--- a/infra/bots/recipe_modules/flavor/default.py
+++ b/infra/bots/recipe_modules/flavor/default.py
@@ -257,9 +257,11 @@
profname)
if path:
- env['PATH'] = '%%(PATH)s:%s' % ':'.join('%s' % p for p in path)
+ env['PATH'] = self.m.path.pathsep.join(
+ ['%(PATH)s'] + ['%s' % p for p in path])
if ld_library_path:
- env['LD_LIBRARY_PATH'] = ':'.join('%s' % p for p in ld_library_path)
+ env['LD_LIBRARY_PATH'] = self.m.path.pathsep.join(
+ '%s' % p for p in ld_library_path)
to_symbolize = ['dm', 'nanobench']
if name in to_symbolize and self.m.vars.is_linux:
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN.json
new file mode 100644
index 0000000..f2b5f8d
--- /dev/null
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN.json
@@ -0,0 +1,188 @@
+[
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "file.txt",
+ "/path/to/tmp/"
+ ],
+ "infra_step": true,
+ "name": "read file.txt"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "remove",
+ "file.txt"
+ ],
+ "infra_step": true,
+ "name": "remove file.txt"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "results_dir"
+ ],
+ "infra_step": true,
+ "name": "rmtree results_dir"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "results_dir"
+ ],
+ "infra_step": true,
+ "name": "makedirs results_dir"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "rmtree",
+ "device_results_dir"
+ ],
+ "infra_step": true,
+ "name": "rmtree device_results_dir"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "ensure-directory",
+ "--mode",
+ "0777",
+ "device_results_dir"
+ ],
+ "infra_step": true,
+ "name": "makedirs device_results_dir"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
+ "/path/to/tmp/"
+ ],
+ "infra_step": true,
+ "name": "Get skp VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "42",
+ "[START_DIR]\\tmp\\SKP_VERSION"
+ ],
+ "infra_step": true,
+ "name": "write SKP_VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
+ "/path/to/tmp/"
+ ],
+ "infra_step": true,
+ "name": "Get skimage VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "42",
+ "[START_DIR]\\tmp\\SK_IMAGE_VERSION"
+ ],
+ "infra_step": true,
+ "name": "write SK_IMAGE_VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
+ "/path/to/tmp/"
+ ],
+ "infra_step": true,
+ "name": "Get svg VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "42",
+ "[START_DIR]\\tmp\\SVG_VERSION"
+ ],
+ "infra_step": true,
+ "name": "write SVG_VERSION"
+ },
+ {
+ "cmd": [
+ "[START_DIR]\\build\\nanobench",
+ "--some-flag"
+ ],
+ "env": {
+ "ASAN_OPTIONS": "symbolize=1 detect_leaks=1",
+ "CHROME_HEADLESS": "1",
+ "LD_LIBRARY_PATH": "[START_DIR]\\clang_linux/lib",
+ "LSAN_OPTIONS": "symbolize=1 print_suppressions=1",
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools];[START_DIR]\\clang_linux/bin",
+ "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1"
+ },
+ "name": "nanobench"
+ },
+ {
+ "jsonResult": null,
+ "name": "$result"
+ }
+]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json
index aaf0b74..24df593 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump.json
@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
@@ -17,7 +17,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"remove",
@@ -30,7 +30,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
@@ -43,7 +43,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
@@ -58,7 +58,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
@@ -71,7 +71,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
@@ -86,11 +86,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/skp/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -100,12 +100,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SKP_VERSION"
+ "[START_DIR]\\tmp\\SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION"
@@ -114,11 +114,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -128,12 +128,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SK_IMAGE_VERSION"
+ "[START_DIR]\\tmp\\SK_IMAGE_VERSION"
],
"infra_step": true,
"name": "write SK_IMAGE_VERSION"
@@ -142,11 +142,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/svg/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -156,12 +156,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SVG_VERSION"
+ "[START_DIR]\\tmp\\SVG_VERSION"
],
"infra_step": true,
"name": "write SVG_VERSION"
@@ -170,32 +170,32 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]/dumps"
+ "[START_DIR]\\[SWARM_OUT_DIR]\\dumps"
],
"infra_step": true,
"name": "makedirs dumps"
},
{
"cmd": [
- "[START_DIR]/procdump_win/procdump64.exe",
+ "[START_DIR]\\procdump_win\\procdump64.exe",
"-accepteula",
"-mp",
"-e",
"1",
"-x",
- "[START_DIR]/[SWARM_OUT_DIR]/dumps",
- "[START_DIR]/build/dm",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\dumps",
+ "[START_DIR]\\build\\dm",
"--some-flag"
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "dm"
},
diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py
index 3e92ff7..42d71a9 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -5,6 +5,7 @@
DEPS = [
'flavor',
+ 'recipe_engine/platform',
'recipe_engine/properties',
'recipe_engine/raw_io',
'run',
@@ -72,6 +73,7 @@
'Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All',
'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN',
'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN',
+ 'Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN',
'Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android',
'Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android',
'Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android',
@@ -106,6 +108,8 @@
api.test(buildername) +
api.properties(**defaultProps(buildername))
)
+ if 'Win' in buildername and not 'LenovoYogaC630' in buildername:
+ test += api.platform('win', 64)
if 'Chromecast' in buildername:
test += api.step_data(
'read chromecast ip',
diff --git a/infra/bots/recipe_modules/git/api.py b/infra/bots/recipe_modules/git/api.py
index 629937d..647092a 100644
--- a/infra/bots/recipe_modules/git/api.py
+++ b/infra/bots/recipe_modules/git/api.py
@@ -15,4 +15,5 @@
"""
git_dir = self.m.path['start_dir'].join('git')
git_bin = git_dir.join('bin')
- return self.m.env({'PATH': '%s:%s:%%(PATH)s' % (git_dir, git_bin)})
+ return self.m.env({'PATH': self.m.path.pathsep.join(
+ [str(git_dir), str(git_bin), '%(PATH)s'])})
diff --git a/infra/bots/recipe_modules/git/examples/full.expected/test-win.json b/infra/bots/recipe_modules/git/examples/full.expected/test-win.json
new file mode 100644
index 0000000..11c7ceb
--- /dev/null
+++ b/infra/bots/recipe_modules/git/examples/full.expected/test-win.json
@@ -0,0 +1,23 @@
+[
+ {
+ "cmd": [
+ "git",
+ "status"
+ ],
+ "name": "1"
+ },
+ {
+ "cmd": [
+ "git",
+ "status"
+ ],
+ "env": {
+ "PATH": "[START_DIR]\\git;[START_DIR]\\git\\bin;<PATH>"
+ },
+ "name": "2"
+ },
+ {
+ "jsonResult": null,
+ "name": "$result"
+ }
+]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/git/examples/full.py b/infra/bots/recipe_modules/git/examples/full.py
index a24d903..e4ca058 100644
--- a/infra/bots/recipe_modules/git/examples/full.py
+++ b/infra/bots/recipe_modules/git/examples/full.py
@@ -5,6 +5,7 @@
DEPS = [
'git',
+ 'recipe_engine/platform',
'recipe_engine/step',
]
@@ -17,3 +18,4 @@
def GenTests(api):
yield api.test('test')
+ yield api.test('test-win') + api.platform('win', 64)
diff --git a/infra/bots/recipe_modules/run/examples/full.expected/test.json b/infra/bots/recipe_modules/run/examples/full.expected/test.json
index 8fdbb194..a360f7b 100644
--- a/infra/bots/recipe_modules/run/examples/full.expected/test.json
+++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json
@@ -5,7 +5,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "fail",
"~followup_annotations": [
@@ -18,7 +18,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "fail again",
"~followup_annotations": [
@@ -32,7 +32,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "do a thing"
},
@@ -43,7 +43,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "run 0"
},
@@ -51,7 +51,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
@@ -65,7 +65,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
@@ -79,7 +79,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
@@ -92,11 +92,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/cache/work/skia/infra/bots/assets/my_asset/VERSION",
+ "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\my_asset\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -108,7 +108,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "mydir:<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "mydir:<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "env"
},
@@ -118,7 +118,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry fail",
"~followup_annotations": [
@@ -132,7 +132,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "between_attempts #1"
},
@@ -142,7 +142,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry fail (attempt 2)",
"~followup_annotations": [
@@ -156,7 +156,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "between_attempts #2"
},
@@ -166,7 +166,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry fail (attempt 3)",
"~followup_annotations": [
@@ -180,7 +180,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "between_attempts #3"
},
@@ -190,7 +190,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry fail (attempt 4)",
"~followup_annotations": [
@@ -204,7 +204,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "between_attempts #4"
},
@@ -214,7 +214,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry fail (attempt 5)",
"~followup_annotations": [
@@ -227,7 +227,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry success",
"~followup_annotations": [
@@ -241,7 +241,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "between_attempts #1 (2)"
},
@@ -251,7 +251,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry success (attempt 2)",
"~followup_annotations": [
@@ -265,7 +265,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "between_attempts #2 (2)"
},
@@ -275,7 +275,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "retry success (attempt 3)"
},
diff --git a/infra/bots/recipe_modules/run/examples/full.py b/infra/bots/recipe_modules/run/examples/full.py
index d6a27c9..d40b03f 100644
--- a/infra/bots/recipe_modules/run/examples/full.py
+++ b/infra/bots/recipe_modules/run/examples/full.py
@@ -6,6 +6,7 @@
DEPS = [
'recipe_engine/context',
'recipe_engine/path',
+ 'recipe_engine/platform',
'recipe_engine/properties',
'recipe_engine/step',
'run',
@@ -70,6 +71,7 @@
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
+ api.platform('win', 64) +
api.step_data('fail', retcode=1) +
api.step_data('fail again', retcode=1) +
api.step_data('retry fail', retcode=1) +
diff --git a/infra/bots/recipe_modules/vars/examples/full.py b/infra/bots/recipe_modules/vars/examples/full.py
index 1c8195f..4709558 100644
--- a/infra/bots/recipe_modules/vars/examples/full.py
+++ b/infra/bots/recipe_modules/vars/examples/full.py
@@ -5,6 +5,7 @@
DEPS = [
'recipe_engine/path',
+ 'recipe_engine/platform',
'recipe_engine/properties',
'vars',
]
@@ -46,6 +47,7 @@
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]',
patch_storage='gerrit') +
+ api.platform('win', 64) +
api.properties.tryserver(
buildername=buildername,
gerrit_project='skia',
diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json
index 6bac4d3..426afa7 100644
--- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json
+++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json
@@ -3,13 +3,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cache/work"
+ "[START_DIR]\\cache\\work"
],
"infra_step": true,
"name": "makedirs checkout_path"
@@ -18,36 +18,36 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"remove",
- "[START_DIR]/cache/work/.gclient_entries"
+ "[START_DIR]\\cache\\work\\.gclient_entries"
],
"infra_step": true,
- "name": "remove [START_DIR]/cache/work/.gclient_entries"
+ "name": "remove [START_DIR]\\cache\\work\\.gclient_entries"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--spec-path",
- "cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
+ "cache_dir = '[START_DIR]\\\\cache\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
"--patch_root",
"skia",
"--revision_mapping_file",
"{\"got_revision\": \"skia\"}",
"--git-cache-dir",
- "[START_DIR]/cache/git",
+ "[START_DIR]\\cache\\git",
"--cleanup-dir",
- "[CLEANUP]/bot_update",
+ "[CLEANUP]\\bot_update",
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123"
],
- "cwd": "[START_DIR]/cache/work",
+ "cwd": "[START_DIR]\\cache\\work",
"env_prefixes": {
"PATH": [
"RECIPE_REPO[depot_tools]"
@@ -97,13 +97,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/tmp"
+ "[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
@@ -112,11 +112,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/cache/work/skia/infra/bots/assets/clang_win/VERSION",
+ "[START_DIR]\\cache\\work\\skia\\infra\\bots\\assets\\clang_win\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -126,27 +126,27 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/cache/work/skia/bin/fetch-gn"
+ "[START_DIR]\\cache\\work\\skia\\bin\\fetch-gn"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
- "[START_DIR]/cache/work/skia/bin/gn",
+ "[START_DIR]\\cache\\work\\skia\\bin\\gn",
"gen",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug/Debug",
- "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" werror=true win_sdk=\"[START_DIR]/win_toolchain/win_sdk\" win_vc=\"[START_DIR]/win_toolchain/VC\""
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug",
+ "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" werror=true win_sdk=\"[START_DIR]\\win_toolchain/win_sdk\" win_vc=\"[START_DIR]\\win_toolchain/VC\""
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "gn gen"
},
@@ -154,12 +154,12 @@
"cmd": [
"ninja",
"-C",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug/Debug"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug"
],
- "cwd": "[START_DIR]/cache/work/skia",
+ "cwd": "[START_DIR]\\cache\\work\\skia",
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "ninja"
},
@@ -168,8 +168,8 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[START_DIR]/cache/work/skia/out/Build-Win-Clang-x86-Debug/Debug",
- "[START_DIR]/[SWARM_OUT_DIR]"
+ "[START_DIR]\\cache\\work\\skia\\out\\Build-Win-Clang-x86-Debug\\Debug",
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "copy build products",
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py
index cea7af4..cb25205 100644
--- a/infra/bots/recipes/compile.py
+++ b/infra/bots/recipes/compile.py
@@ -117,4 +117,6 @@
api.path['start_dir'].join('tmp', 'uninteresting_hashes.txt')
)
)
+ if 'Win' in builder:
+ test += api.platform('win', 64)
yield test
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
index 0931fbc..d925775 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench.json
@@ -3,13 +3,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/tmp"
+ "[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
@@ -18,11 +18,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/skp/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -32,12 +32,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SKP_VERSION"
+ "[START_DIR]\\tmp\\SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION"
@@ -46,13 +46,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -61,18 +61,18 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/skia/tools/skpbench/skpbench.py",
- "[START_DIR]/build/skpbench",
+ "[START_DIR]\\skia\\tools\\skpbench\\skpbench.py",
+ "[START_DIR]\\build\\skpbench",
"--resultsfile",
- "[START_DIR]/[SWARM_OUT_DIR]/table",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\table",
"--config",
"vk",
"-v5",
- "[START_DIR]/skp"
+ "[START_DIR]\\skp"
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "skpbench"
},
@@ -108,8 +108,8 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/skia/tools/skpbench/skiaperf.py",
- "[START_DIR]/[SWARM_OUT_DIR]/table",
+ "[START_DIR]\\skia\\tools\\skpbench\\skiaperf.py",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\table",
"--properties",
"gitHash",
"abc123",
@@ -118,7 +118,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\skpbench_abc123_1337000001.json",
"--key",
"arch",
"x86_64",
@@ -139,7 +139,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "Parse skpbench output into Perf json"
},
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json
index dd863db..e9bd250 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLRecord_9x9.json
@@ -3,13 +3,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/tmp"
+ "[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
@@ -18,11 +18,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/skp/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -32,12 +32,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SKP_VERSION"
+ "[START_DIR]\\tmp\\SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION"
@@ -46,13 +46,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -61,10 +61,10 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/skia/tools/skpbench/skpbench.py",
- "[START_DIR]/build/skpbench",
+ "[START_DIR]\\skia\\tools\\skpbench\\skpbench.py",
+ "[START_DIR]\\build\\skpbench",
"--resultsfile",
- "[START_DIR]/[SWARM_OUT_DIR]/table",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\table",
"--config",
"vk",
"-v5",
@@ -76,11 +76,11 @@
"9",
"--ddlTilingWidthHeight",
"3",
- "[START_DIR]/skp"
+ "[START_DIR]\\skp"
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "skpbench"
},
@@ -116,8 +116,8 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/skia/tools/skpbench/skiaperf.py",
- "[START_DIR]/[SWARM_OUT_DIR]/table",
+ "[START_DIR]\\skia\\tools\\skpbench\\skiaperf.py",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\table",
"--properties",
"gitHash",
"abc123",
@@ -126,7 +126,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\skpbench_abc123_1337000001.json",
"--key",
"arch",
"x86_64",
@@ -147,7 +147,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "Parse skpbench output into Perf json"
},
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
index 5bb5759..a371515a 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9.json
@@ -3,13 +3,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/tmp"
+ "[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
@@ -18,11 +18,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/skp/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -32,12 +32,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SKP_VERSION"
+ "[START_DIR]\\tmp\\SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION"
@@ -46,13 +46,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/[SWARM_OUT_DIR]"
+ "[START_DIR]\\[SWARM_OUT_DIR]"
],
"infra_step": true,
"name": "makedirs perf_dir"
@@ -61,10 +61,10 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/skia/tools/skpbench/skpbench.py",
- "[START_DIR]/build/skpbench",
+ "[START_DIR]\\skia\\tools\\skpbench\\skpbench.py",
+ "[START_DIR]\\build\\skpbench",
"--resultsfile",
- "[START_DIR]/[SWARM_OUT_DIR]/table",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\table",
"--config",
"vk",
"-v5",
@@ -75,11 +75,11 @@
"9",
"--ddlTilingWidthHeight",
"3",
- "[START_DIR]/skp"
+ "[START_DIR]\\skp"
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "skpbench"
},
@@ -115,8 +115,8 @@
"cmd": [
"python",
"-u",
- "[START_DIR]/skia/tools/skpbench/skiaperf.py",
- "[START_DIR]/[SWARM_OUT_DIR]/table",
+ "[START_DIR]\\skia\\tools\\skpbench\\skiaperf.py",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\table",
"--properties",
"gitHash",
"abc123",
@@ -125,7 +125,7 @@
"swarming_task_id",
"123456",
"--outfile",
- "[START_DIR]/[SWARM_OUT_DIR]/skpbench_abc123_1337000001.json",
+ "[START_DIR]\\[SWARM_OUT_DIR]\\skpbench_abc123_1337000001.json",
"--key",
"arch",
"x86_64",
@@ -146,7 +146,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "Parse skpbench output into Perf json"
},
diff --git a/infra/bots/recipes/skpbench.py b/infra/bots/recipes/skpbench.py
index 09e4bac..f0b99b1 100644
--- a/infra/bots/recipes/skpbench.py
+++ b/infra/bots/recipes/skpbench.py
@@ -14,6 +14,7 @@
'recipe_engine/context',
'recipe_engine/file',
'recipe_engine/path',
+ 'recipe_engine/platform',
'recipe_engine/properties',
'recipe_engine/python',
'recipe_engine/raw_io',
@@ -165,7 +166,8 @@
api.step_data('get swarming task id',
stdout=api.raw_io.output('123456'))
)
-
+ if 'Win' in builder and not 'LenovoYogaC630' in builder:
+ test += api.platform('win', 64)
yield test
b = ('Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-'
diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json
index decfb99..05394d1 100644
--- a/infra/bots/recipes/test.expected/trybot.json
+++ b/infra/bots/recipes/test.expected/trybot.json
@@ -3,13 +3,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/tmp"
+ "[START_DIR]\\tmp"
],
"infra_step": true,
"name": "makedirs tmp_dir"
@@ -18,11 +18,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/skp/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -32,12 +32,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SKP_VERSION"
+ "[START_DIR]\\tmp\\SKP_VERSION"
],
"infra_step": true,
"name": "write SKP_VERSION"
@@ -46,11 +46,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -60,12 +60,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SK_IMAGE_VERSION"
+ "[START_DIR]\\tmp\\SK_IMAGE_VERSION"
],
"infra_step": true,
"name": "write SK_IMAGE_VERSION"
@@ -74,11 +74,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
- "[START_DIR]/skia/infra/bots/assets/svg/VERSION",
+ "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
"/path/to/tmp/"
],
"infra_step": true,
@@ -88,12 +88,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"copy",
"42",
- "[START_DIR]/tmp/SVG_VERSION"
+ "[START_DIR]\\tmp\\SVG_VERSION"
],
"infra_step": true,
"name": "write SVG_VERSION"
@@ -102,11 +102,11 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[START_DIR]/test"
+ "[START_DIR]\\test"
],
"infra_step": true,
"name": "rmtree test"
@@ -115,13 +115,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/test"
+ "[START_DIR]\\test"
],
"infra_step": true,
"name": "makedirs test"
@@ -132,11 +132,11 @@
"-u",
"\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = sys.argv[1]\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[2], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
"https://example.com/hashes.txt",
- "[START_DIR]/tmp/uninteresting_hashes.txt"
+ "[START_DIR]\\tmp\\uninteresting_hashes.txt"
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "get uninteresting hashes",
@@ -204,15 +204,15 @@
},
{
"cmd": [
- "[START_DIR]/build/dm",
+ "[START_DIR]\\build\\dm",
"--resourcePath",
- "[START_DIR]/skia/resources",
+ "[START_DIR]\\skia\\resources",
"--skps",
- "[START_DIR]/skp",
+ "[START_DIR]\\skp",
"--images",
- "[START_DIR]/skimage/dm",
+ "[START_DIR]\\skimage\\dm",
"--colorImages",
- "[START_DIR]/skimage/colorspace",
+ "[START_DIR]\\skimage\\colorspace",
"--nameByHash",
"--properties",
"gitHash",
@@ -234,7 +234,7 @@
"swarming_task_id",
"",
"--svgs",
- "[START_DIR]/svg",
+ "[START_DIR]\\svg",
"--key",
"arch",
"x86",
@@ -253,9 +253,9 @@
"style",
"default",
"--uninterestingHashesFile",
- "[START_DIR]/tmp/uninteresting_hashes.txt",
+ "[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
- "[START_DIR]/[SWARM_OUT_DIR]",
+ "[START_DIR]\\[SWARM_OUT_DIR]",
"--dont_write",
"pdf",
"--randomProcessorTest",
@@ -427,7 +427,7 @@
],
"env": {
"CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+ "PATH": "<PATH>;RECIPE_REPO[depot_tools]"
},
"name": "dm"
},
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 597309d..c3934bf 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -1112,6 +1112,7 @@
gold_hashes_url='https://example.com/hashes.txt',
swarm_out_dir='[SWARM_OUT_DIR]',
task_id='task_12345') +
+ api.platform('win', 64) +
api.properties(patch_storage='gerrit') +
api.properties.tryserver(
buildername=builder,
