diff options
| -rwxr-xr-x | test/etc/default-build | 6 | ||||
| -rwxr-xr-x | test/run-test | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/test/etc/default-build b/test/etc/default-build index 431896631d..d74b24d985 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -97,7 +97,7 @@ JAVAC_EXPERIMENTAL_ARGS["agents"]="-source 1.8 -target 1.8" while true; do if [ "x$1" = "x--dx-option" ]; then shift - on="$1" + option="$1" DX_FLAGS="${DX_FLAGS} $option" shift elif [ "x$1" = "x--jvm" ]; then @@ -209,9 +209,9 @@ if [ ${HAS_SRC_DEX2OAT_UNRESOLVED} = "true" ]; then ${JACK} --import classes.jill.jar --output-dex . else if [ ${NEED_DEX} = "true" ]; then - ${DX} -JXmx256m --debug --dex --dump-to=classes-ex.lst --output=classes.dex --dump-width=1000 classes-ex + ${DX} -JXmx256m --debug --dex --dump-to=classes-ex.lst --output=classes.dex --dump-width=1000 ${DX_FLAGS} classes-ex zip ${TEST_NAME}-ex.jar classes.dex - ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes + ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 ${DX_FLAGS} classes fi fi else diff --git a/test/run-test b/test/run-test index e808deef52..6134a14696 100755 --- a/test/run-test +++ b/test/run-test @@ -247,6 +247,11 @@ while true; do option="$1" run_args="${run_args} -Xcompiler-option $option" shift + elif [ "x$1" = "x--build-option" ]; then + shift + option="$1" + build_args="${build_args} $option" + shift elif [ "x$1" = "x--runtime-option" ]; then shift option="$1" @@ -611,6 +616,7 @@ if [ "$usage" = "yes" ]; then echo " Runtime Options:" echo " -O Run non-debug rather than debug build (off by default)." echo " -Xcompiler-option Pass an option to the compiler." + echo " --build-option Pass an option to the build script." echo " --runtime-option Pass an option to the runtime." echo " --debug Wait for a debugger to attach." echo " --debuggable Whether to compile Java code for a debugger." |