summaryrefslogtreecommitdiff
path: root/test/1966-get-set-local-objects-no-table
diff options
context:
space:
mode:
Diffstat (limited to 'test/1966-get-set-local-objects-no-table')
-rw-r--r--test/1966-get-set-local-objects-no-table/build.py21
-rwxr-xr-x[-rw-r--r--]test/1966-get-set-local-objects-no-table/generate-sources (renamed from test/1966-get-set-local-objects-no-table/build)1
-rw-r--r--[-rwxr-xr-x]test/1966-get-set-local-objects-no-table/run.py (renamed from test/1966-get-set-local-objects-no-table/run)12
3 files changed, 28 insertions, 6 deletions
diff --git a/test/1966-get-set-local-objects-no-table/build.py b/test/1966-get-set-local-objects-no-table/build.py
new file mode 100644
index 0000000000..3a908c0321
--- /dev/null
+++ b/test/1966-get-set-local-objects-no-table/build.py
@@ -0,0 +1,21 @@
+#
+# 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.
+
+import os
+
+
+def build(ctx):
+ ctx.bash("./generate-sources --" + ctx.mode)
+ ctx.default_build()
diff --git a/test/1966-get-set-local-objects-no-table/build b/test/1966-get-set-local-objects-no-table/generate-sources
index 6631df91b7..c2f8653ef6 100644..100755
--- a/test/1966-get-set-local-objects-no-table/build
+++ b/test/1966-get-set-local-objects-no-table/generate-sources
@@ -22,4 +22,3 @@ if [[ $@ != *"--jvm"* ]]; then
else
mv smali smali-unused
fi
-./default-build "$@"
diff --git a/test/1966-get-set-local-objects-no-table/run b/test/1966-get-set-local-objects-no-table/run.py
index 9b741ee47f..77a45e9484 100755..100644
--- a/test/1966-get-set-local-objects-no-table/run
+++ b/test/1966-get-set-local-objects-no-table/run.py
@@ -14,8 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# If we compile the .oat files non-debuggable we could end up with dex2dex running over the files
-# which will cause some instructions to be removed from smali/TestCases1966.smali. This test relies
-# on the instructions being exactly as written so pass --debuggable to 'dex2oat' only to prevent
-# this from happening.
-./default-run "$@" --jvmti --compiler-only-option --debuggable
+
+def run(ctx, args):
+ # If we compile the .oat files non-debuggable we could end up with dex2dex running over the files
+ # which will cause some instructions to be removed from smali/TestCases1966.smali. This test relies
+ # on the instructions being exactly as written so pass --debuggable to 'dex2oat' only to prevent
+ # this from happening.
+ ctx.default_run(args, jvmti=True, compiler_only_option=["--debuggable"])