3 files changed, 33 insertions, 8 deletions
diff --git a/test/2239-varhandle-perf/check b/test/2239-varhandle-perf/build.py
index 8ea102d53c..3466dfece7 100644
--- a/test/2239-varhandle-perf/check
+++ b/test/2239-varhandle-perf/build.py
@@ -1,6 +1,5 @@
-#!/bin/bash
 #
-# Copyright 2020 The Android Open Source Project
+# 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.
@@ -14,8 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Dump the output of the benchmarks that run and report success. The
-# benchmarks ran successfully if we get as far as this script.
 
-cat "$2"
-exit 0
+def build(ctx):
+  ctx.bash("./generate-sources")
+  if ctx.jvm:
+    return  # The test does not build on JVM
+
+  ctx.default_build(api_level="var-handles")
diff --git a/test/2239-varhandle-perf/build b/test/2239-varhandle-perf/generate-sources
index 115a0fba49..310ad06f46 100755
--- a/test/2239-varhandle-perf/build
+++ b/test/2239-varhandle-perf/generate-sources
@@ -28,5 +28,3 @@ mkdir -p src2
 
 # Generate tests and Main that covers both the generated tests and manual tests
 python3 ./util-src/generate_java.py "${GENERATED_SRC}"
-
-./default-build "$@" --experimental var-handles
diff --git a/test/2239-varhandle-perf/run.py b/test/2239-varhandle-perf/run.py
new file mode 100644
index 0000000000..4e8755dbda
--- /dev/null
+++ b/test/2239-varhandle-perf/run.py
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# Copyright 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 run(ctx, args):
+  ctx.default_run(args)
+
+  # Dump the output of the benchmarks that run and report success. The
+  # benchmarks ran successfully if we get as far as this script.
+  ctx.run(fr"cat '{args.stdout_file}'")
+
+  # Delete all output to make the diff unconditionally pass.
+  ctx.run(fr"> '{args.stdout_file}'")