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

Unified Diff: scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json

Issue 2402583003: Revert "Fix file.copy recipe_module to not fail if files are already equal." (Closed)
Patch Set: 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_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
diff --git a/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index 00727477de41b35d5f1db37afc985fd373ba6577..0f2a6a74c4b59a2aad521325b0ab8957abefe215 100644
--- a/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -50,7 +50,7 @@
"cmd": [
"python",
"-u",
- "\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",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",
"/path/to/tmp/"
],
@@ -70,7 +70,7 @@
"cmd": [
"python",
"-u",
- "\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",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
"/path/to/tmp/"
],
@@ -285,7 +285,7 @@
"cmd": [
"python",
"-u",
- "\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",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/out/coverage_results/file 1",
"[CUSTOM_[SWARM_OUT_DIR]]"
],
@@ -295,7 +295,7 @@
"cmd": [
"python",
"-u",
- "\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",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/out/coverage_results/file 2",
"[CUSTOM_[SWARM_OUT_DIR]]"
],

Powered by Google App Engine
This is Rietveld 408576698