Index: infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json |
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json |
index fd18b404c3848d4a0e59ea83518238def2444d62..63f6c929ae251660fea8b1511d09df54f6b78994 100644 |
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json |
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json |
@@ -146,7 +146,7 @@ |
"cmd": [ |
"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', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe']\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", |
+ "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', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\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", |
"[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan\\Release_x64", |
"[CUSTOM_[SWARM_OUT_DIR]]\\out\\Release_x64" |
], |
@@ -160,7 +160,44 @@ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", |
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", |
- "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe']@@@", |
+ "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@", |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@try:@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", |
+ "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ raise@@@", |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "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', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\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", |
+ "[SLAVE_BUILD]\\win_vulkan_sdk", |
+ "[CUSTOM_[SWARM_OUT_DIR]]" |
+ ], |
+ "name": "copy build products (2)", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@import errno@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import glob@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import os@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import shutil@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", |
+ "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", |
+ "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@", |
"@@@STEP_LOG_LINE@python.inline@@@@", |
"@@@STEP_LOG_LINE@python.inline@try:@@@", |
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", |