Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2613)

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json

Issue 2400963002: Fix file.copy recipe_module to not fail if files are already equal. (Closed)
Patch Set: all expectations, omg! Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
index ed972482160a070d25f4cb6869b56ea11d852ddb..e38b314712c89a9bede2236fd0975c39d9524ee5 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
@@ -719,7 +719,7 @@
"cmd": [
"python",
"-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "\nimport shutil\nimport sys\n# Apparently, shutil.copy fails if files are binary-equal on *nix OSes.\n# See http://crbug.com/636168#c8.\nif hasattr(shutil, '_samefile'):\n if shutil._samefile(sys.argv[1], sys.argv[2]):\n sys.exit(0)\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
@@ -729,7 +729,7 @@
"cmd": [
"python",
"-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "\nimport shutil\nimport sys\n# Apparently, shutil.copy fails if files are binary-equal on *nix OSes.\n# See http://crbug.com/636168#c8.\nif hasattr(shutil, '_samefile'):\n if shutil._samefile(sys.argv[1], sys.argv[2]):\n sys.exit(0)\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],

Powered by Google App Engine
This is Rietveld 408576698