From 0fb63dfc7ef0abd249ebae9537f8785942b0d78e Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Tue, 23 Aug 2022 14:11:30 -0400
Subject: [PATCH] fix tests (#8334)

---
 .../test_data/expected_trial_build_steps.json | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/infra/build/functions/test_data/expected_trial_build_steps.json b/infra/build/functions/test_data/expected_trial_build_steps.json
index e5489d2ef..1cd2348dc 100644
--- a/infra/build/functions/test_data/expected_trial_build_steps.json
+++ b/infra/build/functions/test_data/expected_trial_build_steps.json
@@ -145,6 +145,47 @@
     ],
     "id": "srcmap"
   },
+  {
+    "name": "gcr.io/cloud-builders/docker",
+    "args": [
+      "run",
+      "--privileged",
+      "linuxkit/binfmt:v0.8"
+    ]
+  },
+  {
+    "name": "gcr.io/cloud-builders/docker",
+    "args": [
+      "buildx",
+      "create",
+      "--name",
+      "buildxbuilder"
+    ]
+  },
+  {
+    "name": "gcr.io/cloud-builders/docker",
+    "args": [
+      "buildx",
+      "use",
+      "buildxbuilder"
+    ]
+  },
+  {
+    "name": "gcr.io/cloud-builders/docker",
+    "args": [
+      "buildx",
+      "build",
+      "--platform",
+      "linux/arm64",
+      "--progress",
+      "plain",
+      "--load",
+      "--tag",
+      "gcr.io/oss-fuzz/skcms-aarch64",
+      "."
+    ],
+    "dir": "oss-fuzz/projects/skcms"
+  },
   {
     "name": "gcr.io/cloud-builders/docker",
     "env": [
@@ -409,6 +450,94 @@
       "targets_list > /workspace/targets.list.address"
     ]
   },
+  {
+    "name": "gcr.io/cloud-builders/docker",
+    "env": [
+      "ARCHITECTURE=aarch64",
+      "FUZZING_ENGINE=libfuzzer",
+      "FUZZING_LANGUAGE=c++",
+      "HOME=/root",
+      "OUT=/workspace/out/libfuzzer-address-aarch64",
+      "SANITIZER=address"
+    ],
+    "args": [
+      "run",
+      "--platform",
+      "linux/arm64",
+      "-v",
+      "/workspace:/workspace",
+      "-e",
+      "ARCHITECTURE=aarch64",
+      "-e",
+      "FUZZING_ENGINE=libfuzzer",
+      "-e",
+      "FUZZING_LANGUAGE=c++",
+      "-e",
+      "HOME=/root",
+      "-e",
+      "OUT=/workspace/out/libfuzzer-address-aarch64",
+      "-e",
+      "SANITIZER=address",
+      "-t",
+      "gcr.io/oss-fuzz/skcms-aarch64",
+      "bash",
+      "-c",
+      "rm -r /out && cd /src && cd skcms && mkdir -p /workspace/out/libfuzzer-address-aarch64 && compile || (echo \"********************************************************************************\nFailed to build.\nTo reproduce, run:\npython infra/helper.py build_image skcms\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture aarch64 skcms\n********************************************************************************\" && false)"
+    ],
+    "id": "compile-libfuzzer-address-aarch64"
+  },
+  {
+    "name": "gcr.io/cloud-builders/docker",
+    "env": [
+      "ARCHITECTURE=aarch64",
+      "FUZZING_ENGINE=libfuzzer",
+      "FUZZING_LANGUAGE=c++",
+      "HOME=/root",
+      "OUT=/workspace/out/libfuzzer-address-aarch64",
+      "SANITIZER=address"
+    ],
+    "args": [
+      "run",
+      "--platform",
+      "linux/arm64",
+      "-v",
+      "/workspace:/workspace",
+      "-e",
+      "ARCHITECTURE=aarch64",
+      "-e",
+      "FUZZING_ENGINE=libfuzzer",
+      "-e",
+      "FUZZING_LANGUAGE=c++",
+      "-e",
+      "HOME=/root",
+      "-e",
+      "OUT=/workspace/out/libfuzzer-address-aarch64",
+      "-e",
+      "SANITIZER=address",
+      "-t",
+      "gcr.io/oss-fuzz-base/base-runner-testing-mybranch",
+      "bash",
+      "-c",
+      "test_all.py || (echo \"********************************************************************************\nBuild checks failed.\nTo reproduce, run:\npython infra/helper.py build_image skcms\npython infra/helper.py build_fuzzers --sanitizer address --engine libfuzzer --architecture aarch64 skcms\npython infra/helper.py check_build --sanitizer address --engine libfuzzer --architecture aarch64 skcms\n********************************************************************************\" && false)"
+    ],
+    "id": "build-check-libfuzzer-address-aarch64"
+  },
+  {
+    "name": "gcr.io/oss-fuzz-base/base-runner-testing-mybranch",
+    "env": [
+      "ARCHITECTURE=aarch64",
+      "FUZZING_ENGINE=libfuzzer",
+      "FUZZING_LANGUAGE=c++",
+      "HOME=/root",
+      "OUT=/workspace/out/libfuzzer-address-aarch64",
+      "SANITIZER=address"
+    ],
+    "args": [
+      "bash",
+      "-c",
+      "targets_list > /workspace/targets.list.address"
+    ]
+  },
   {
     "name": "gcr.io/cloud-builders/docker",
     "env": [