[infra] Run tests on the builder after patching MSan libraries. (#2497)

* [WORK IN PROGRESS] Debug Travis failure when doing build check for MSan build.

* Change order of "MSan patch libraries" and "build check" steps.

1 files changed, 9 insertions, 9 deletions

diff --git a/infra/gcb/build_project.py b/infra/gcb/build_project.py
index cd466f3f..fcdb1a01 100644
--- a/infra/gcb/build_project.py
+++ b/infra/gcb/build_project.py
@@ -256,15 +256,6 @@ def get_build_steps(project_dir):
                 ],
             })
 
-        if run_tests:
-          build_steps.append(
-              # test binaries
-              {
-                  'name': 'gcr.io/oss-fuzz-base/base-runner',
-                  'env': env,
-                  'args': ['bash', '-c', 'test_all'],
-              })
-
         if sanitizer == 'memory':
           # Patch dynamic libraries to use instrumented ones.
           build_steps.append({
@@ -279,6 +270,15 @@ def get_build_steps(project_dir):
               ],
           })
 
+        if run_tests:
+          build_steps.append(
+              # test binaries
+              {
+                  'name': 'gcr.io/oss-fuzz-base/base-runner',
+                  'env': env,
+                  'args': ['bash', '-c', 'test_all'],
+              })
+
         if project_yaml['labels']:
           # write target labels
           build_steps.append({