Revert^2 "Convert per-test run scripts to python."
This reverts commit 8d6a4e021e1dc4717939e05aee89c9b18e383d12.
Reason for revert: Reland
Test: test.py -r --all-target
Test: diff emitted test commands before and after
Change-Id: I8b99d9b3804615f2ebc50171a4368ad87d809300
diff --git a/test/1966-get-set-local-objects-no-table/run b/test/1966-get-set-local-objects-no-table/run
index 9b741ee..77a45e9 100755
--- a/test/1966-get-set-local-objects-no-table/run
+++ b/test/1966-get-set-local-objects-no-table/run
@@ -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"])