3 files changed, 28 insertions, 3 deletions
diff --git a/test/1003-metadata-section-strings/build.py b/test/1003-metadata-section-strings/build.py
new file mode 100644
index 0000000000..2cd378a24e
--- /dev/null
+++ b/test/1003-metadata-section-strings/build.py
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2022 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+def build(ctx):
+  ctx.bash("./generate-sources")
+  ctx.default_build()
diff --git a/test/1003-metadata-section-strings/build b/test/1003-metadata-section-strings/generate-sources
index cd2cacd834..c3e73f5941 100755
--- a/test/1003-metadata-section-strings/build
+++ b/test/1003-metadata-section-strings/generate-sources
@@ -37,5 +37,3 @@ return "not found";
 }
 }
 EOF
-
-./default-build "$@"
diff --git a/test/1003-metadata-section-strings/run b/test/1003-metadata-section-strings/run.py
index 9762aba6aa..7fc97aa63d 100644
--- a/test/1003-metadata-section-strings/run
+++ b/test/1003-metadata-section-strings/run.py
@@ -14,4 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-exec ${RUN} $@ --profile -Xcompiler-option --compiler-filter=speed-profile -Xcompiler-option --resolve-startup-const-strings=true
+
+def run(ctx, args):
+  ctx.default_run(
+      args,
+      profile=True,
+      Xcompiler_option=[
+          "--compiler-filter=speed-profile",
+          "--resolve-startup-const-strings=true"
+      ])