Skip to content

Commit 41d0f68

Browse files
afq984Chromeos LUCI
authored and
Chromeos LUCI
committed
cop: Remove oss-fuzz-memory
BUG=b:339819126 TEST=cop Change-Id: I94e168ca48fcbdfe1b47f929fecf991717e77e20 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5528488 Tested-by: [email protected] <[email protected]> Reviewed-by: Chih-Yang Hsia <[email protected]> Commit-Queue: Li-Yu Yu <[email protected]>
1 parent 59b3f1e commit 41d0f68

File tree

2 files changed

+2
-51
lines changed

2 files changed

+2
-51
lines changed

.cop/build.yaml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -572,56 +572,6 @@
572572
],
573573
"entrypoint": "python3"
574574
},
575-
{
576-
"name": "gcr.io/${PROJECT_ID}/adhd-archlinux-builder",
577-
"args": [
578-
"-ah",
579-
"oss-fuzz-setup/",
580-
"oss-fuzz-memory/"
581-
],
582-
"id": "oss-fuzz-memory:0",
583-
"waitFor": [
584-
"oss-fuzz-setup:3"
585-
],
586-
"entrypoint": "rsync"
587-
},
588-
{
589-
"name": "gcr.io/cloud-builders/docker",
590-
"args": [
591-
"oss-fuzz/infra/helper.py",
592-
"build_fuzzers",
593-
"--sanitizer",
594-
"memory",
595-
"--engine",
596-
"libfuzzer",
597-
"cras",
598-
"/workspace/oss-fuzz-memory/adhd"
599-
],
600-
"dir": "oss-fuzz-memory",
601-
"id": "oss-fuzz-memory:1",
602-
"waitFor": [
603-
"oss-fuzz-memory:0"
604-
],
605-
"entrypoint": "python3"
606-
},
607-
{
608-
"name": "gcr.io/cloud-builders/docker",
609-
"args": [
610-
"oss-fuzz/infra/helper.py",
611-
"check_build",
612-
"--sanitizer",
613-
"memory",
614-
"--engine",
615-
"libfuzzer",
616-
"cras"
617-
],
618-
"dir": "oss-fuzz-memory",
619-
"id": "oss-fuzz-memory:2",
620-
"waitFor": [
621-
"oss-fuzz-memory:1"
622-
],
623-
"entrypoint": "python3"
624-
},
625575
{
626576
"name": "gcr.io/${PROJECT_ID}/adhd-archlinux-builder",
627577
"args": [

devtools/quick-verifier/build/build_steps.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ func makeBuild(gitSteps *buildplan.Sequence, tags []string) *cloudbuildpb.Build
3232
ossFuzzSetup := b.Add(ossFuzzSetupSteps().WithDep(git))
3333
b.Add(ossFuzzSteps("oss-fuzz-address", "address", "libfuzzer").WithDep(ossFuzzSetup))
3434
b.Add(ossFuzzSteps("oss-fuzz-address-afl", "address", "afl").WithDep(ossFuzzSetup))
35-
b.Add(ossFuzzSteps("oss-fuzz-memory", "memory", "libfuzzer").WithDep(ossFuzzSetup))
35+
// MSan removed in https://github.com/google/oss-fuzz/pull/11938.
36+
// b.Add(ossFuzzSteps("oss-fuzz-memory", "memory", "libfuzzer").WithDep(ossFuzzSetup))
3637
b.Add(ossFuzzSteps("oss-fuzz-undefined", "undefined", "libfuzzer").WithDep(ossFuzzSetup))
3738
// TODO(b/325995661): Figure out why it's broken.
3839
// b.Add(ossFuzzSteps("oss-fuzz-coverage", "coverage", "libfuzzer").WithDep(ossFuzzSetup))

0 commit comments

Comments
 (0)