run-test-jar: Re-order some flags.
Trival no-op which makes no difference to test execution.
This is just a convenience to be able to diff the recorded
test commands with the follow-up CL.
Test: Check recorded commands (the order of flags changed).
Change-Id: Iaa81b77da9fd4012d32ec63f9eac5b31a731f06b
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 1f6bc2d..76d4c93 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -217,6 +217,9 @@
COMPILE_FLAGS+=" --compile-art-test"
ANDROID_FLAGS+=" -Xcompiler-option --compile-art-test"
+RUNTIME_OPTIONS=""
+COMPACT_DEX_LEVEL=""
+
args = list(sys.argv)
arg = ""
def shift():
@@ -301,7 +304,7 @@
elif arg == "--runtime-option":
shift()
option=arg
- FLAGS+=f" {option}"
+ RUNTIME_OPTIONS+=f" {option}"
if option == "-Xmethod-trace":
# Method tracing can slow some tests down a lot.
TIME_OUT_EXTRA+=1200
@@ -321,7 +324,7 @@
shift()
elif arg == "--compact-dex-level":
shift()
- COMPILE_FLAGS+=f" --compact-dex-level={arg}"
+ COMPACT_DEX_LEVEL+=f" --compact-dex-level={arg}"
shift()
elif arg == "--jvmti-redefine-stress":
# APP_IMAGE doesn't really work with jvmti redefine stress
@@ -592,6 +595,9 @@
else:
break
+FLAGS+=RUNTIME_OPTIONS
+COMPILE_FLAGS+=COMPACT_DEX_LEVEL
+
# HACK: Force the use of `signal_dumper` on host.
if HOST:
TIME_OUT="timeout"