Remove special build for Valgrind.

Valgrind uses the unmodified binary. See skia:6267.

BUG=skia:6267

Change-Id: I3fcecf9ffce67ebec88d4005e464c66d25c6aa21
Reviewed-on: https://skia-review.googlesource.com/8833
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index c606d2b..ebf2b10 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -88,6 +88,10 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
                ec = strings.TrimSuffix(ec, "_Skpbench")
                ec = strings.TrimSuffix(ec, "_AbandonGpuContext")
                ec = strings.TrimSuffix(ec, "_PreAbandonGpuContext")
+               if ec == "Valgrind" {
+                       // skia:6267
+                       ec = ""
+               }
                if task_os == "Android" {
                        if ec == "Vulkan" {
                                ec = "Android_Vulkan"

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 2691fbb..b53fe84 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -49,7 +49,6 @@
   "Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths",
   "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD",
   "Build-Ubuntu-GCC-x86_64-Release-Shared",
-  "Build-Ubuntu-GCC-x86_64-Release-Valgrind",
   "Build-Win-Clang-arm64-Release-Android",
   "Build-Win-MSVC-x86-Debug",
   "Build-Win-MSVC-x86-Debug-ANGLE",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 44f71cc..d7013d2 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -300,12 +300,6 @@
         "Build-Ubuntu-GCC-x86_64-Release-Shared"
       ]
     },
-    "Build-Ubuntu-GCC-x86_64-Release-Valgrind": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
-      ]
-    },
     "Build-Win-Clang-arm64-Release-Android": {
       "priority": 0.8,
       "tasks": [
@@ -3106,31 +3100,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Release-Valgrind": {
-      "dimensions": [
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_compile",
-        "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release-Valgrind",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Win-Clang-arm64-Release-Android": {
       "cipd_packages": [
         {
@@ -6338,7 +6307,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -6387,7 +6356,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -11437,7 +11406,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -11486,7 +11455,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",
@@ -11535,7 +11504,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+        "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
         "gpu:10de:1244",