diff options
| author | Andreas Gampe <agampe@google.com> | 2015-08-07 08:29:13 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-08-10 13:09:00 -0700 |
| commit | f695a009725c8c840d916d01c14998f5c5f816d2 (patch) | |
| tree | aead903f2740b4dd4aa3d3b286c0fa25a4c4f8ff /test/etc | |
| parent | 6e9c66e099654b63ed3648bda2daeaf0a862f047 (diff) | |
| download | art-f695a009725c8c840d916d01c14998f5c5f816d2.zip art-f695a009725c8c840d916d01c14998f5c5f816d2.tar.gz art-f695a009725c8c840d916d01c14998f5c5f816d2.tar.bz2 | |
ART: Change UnresolvedMergedType internal representation
Squashed cherry-picks:
* 067f1ed7816cf4eb5d6258ca31b387ddb2073ab7
* 750f7c2827318f6d07620f2ef0321218ea4d8670
* 2f90b3415aadc2587d26c767c6bfb235797119a8
* 2ea7b70b2347969f3735bd0ec1b462bd6d2ff1bd
Bug: 22881413
Diffstat (limited to 'test/etc')
| -rwxr-xr-x | test/etc/run-test-jar | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 240ed41..1a8853a 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -316,6 +316,20 @@ if [ "$PREBUILD" = "y" ]; then --dex-file=$DEX_LOCATION/$TEST_NAME.jar \ --oat-file=$DEX_LOCATION/dalvik-cache/$ISA/$(echo $DEX_LOCATION/$TEST_NAME.jar/classes.dex | cut -d/ -f 2- | sed "s:/:@:g") \ --instruction-set=$ISA" + if [ "x$INSTRUCTION_SET_FEATURES" != "x" ] ; then + dex2oat_cmdline="${dex2oat_cmdline} --instruction-set-features=${INSTRUCTION_SET_FEATURES}" + fi + + # Add in a timeout. This is important for testing the compilation/verification time of + # pathological cases. + # Note: as we don't know how decent targets are (e.g., emulator), only do this on the host for + # now. We should try to improve this. + # The current value is rather arbitrary. run-tests should compile quickly. + if [ "$HOST" != "n" ]; then + # Use SIGRTMIN+2 to try to dump threads. + # Use -k 1m to SIGKILL it a minute later if it hasn't ended. + dex2oat_cmdline="timeout -k 1m -s SIGRTMIN+2 1m ${dex2oat_cmdline}" + fi fi dalvikvm_cmdline="$INVOKE_WITH $GDB $ANDROID_ROOT/bin/$DALVIKVM \ |