diff options
| -rw-r--r-- | test/Android.run-test.mk | 3 | ||||
| -rwxr-xr-x | test/run-test | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 38973f760d..ee6c2efbf4 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -615,6 +615,9 @@ define define-test-art-run-test else run_test_options += --build-with-javac-dx endif + ifeq ($(ART_TEST_WITH_STRACE),true) + run_test_options += --strace + endif ifeq ($(ART_TEST_RUN_TEST_ALWAYS_CLEAN),true) run_test_options += --always-clean endif diff --git a/test/run-test b/test/run-test index f5fff09abe..bdf680b98a 100755 --- a/test/run-test +++ b/test/run-test @@ -117,6 +117,7 @@ check_cmd="check" output="output.txt" build_output="build-output.txt" cfg_output="graph.cfg" +strace_output="strace-output.txt" lib="libartd.so" run_args="--quiet" build_args="" @@ -137,6 +138,7 @@ trace_stream="false" basic_verify="false" gc_verify="false" gc_stress="false" +strace="false" always_clean="no" never_clean="no" have_dex2oat="yes" @@ -235,6 +237,10 @@ while true; do run_args="${run_args} --gdb" dev_mode="yes" shift + elif [ "x$1" = "x--strace" ]; then + strace="yes" + run_args="${run_args} --invoke-with strace --invoke-with -o --invoke-with $tmp_dir/$strace_output" + shift elif [ "x$1" = "x--zygote" ]; then run_args="${run_args} --zygote" shift @@ -750,6 +756,11 @@ fi echo '#################### diffs' diff --strip-trailing-cr -u "$expected" "$output" | tail -n 2000 echo '####################' + if [ "$strace" = "yes" ]; then + echo '#################### strace output' + tail -n 2000 "$tmp_dir/$strace_output" + echo '####################' + fi echo ' ' fi |