OSDN Git Service
Nicolas Geoffray [Mon, 13 Jul 2015 16:04:46 +0000 (16:04 +0000)]
am
6fb5b1bd: Merge "Fix baseline for arm64."
* commit '
6fb5b1bdd5cfcc3c32fedd6539670b01b5cda9a2':
Fix baseline for arm64.
Nicolas Geoffray [Mon, 13 Jul 2015 15:54:02 +0000 (15:54 +0000)]
Merge "Fix baseline for arm64."
Vladimir Marko [Mon, 13 Jul 2015 15:50:44 +0000 (15:50 +0000)]
am
f32521b1: Merge "ART: Don\'t nest indenters in oatdump."
* commit '
f32521b18b3078b2fbd8f1e52d5da9375cd02cbc':
ART: Don't nest indenters in oatdump.
Andreas Gampe [Mon, 13 Jul 2015 15:50:42 +0000 (15:50 +0000)]
am
15c9881c: Merge "ART: Fix arm32 assembly stub CFI"
* commit '
15c9881c7c480d0131099e436cff2f13ba50e5e3':
ART: Fix arm32 assembly stub CFI
Nicolas Geoffray [Mon, 13 Jul 2015 14:55:26 +0000 (15:55 +0100)]
Fix baseline for arm64.
A HFakeString acts like a null constant. Other backends have
different code paths for handling it, so it was only arm64 failing.
Change-Id: Iba44d87c8d114b916404db0302574c7059143010
Vladimir Marko [Mon, 13 Jul 2015 15:42:00 +0000 (15:42 +0000)]
Merge "ART: Don't nest indenters in oatdump."
Nicolas Geoffray [Mon, 13 Jul 2015 15:36:57 +0000 (15:36 +0000)]
am
d562cb13: Merge "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
* commit '
d562cb1347dbb673b6da830cac6fd9e0264d8b2b':
Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""
Andreas Gampe [Mon, 13 Jul 2015 15:35:27 +0000 (15:35 +0000)]
Merge "ART: Fix arm32 assembly stub CFI"
Nicolas Geoffray [Mon, 13 Jul 2015 15:17:37 +0000 (15:17 +0000)]
Merge "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
Roland Levillain [Mon, 13 Jul 2015 14:20:41 +0000 (14:20 +0000)]
am
af12baea: Merge "Re-enable run-test 449-checker-bce on MIPS64."
* commit '
af12baeacf33b46a8b399f19735613539382229a':
Re-enable run-test 449-checker-bce on MIPS64.
Nicolas Geoffray [Mon, 13 Jul 2015 14:06:29 +0000 (14:06 +0000)]
am
f7b3c6ed: Merge "Remove the --compiler-backend option from script."
* commit '
f7b3c6ed3a04e86dc285bac7da7e847e4674e41d':
Remove the --compiler-backend option from script.
Roland Levillain [Mon, 13 Jul 2015 14:06:20 +0000 (14:06 +0000)]
Merge "Re-enable run-test 449-checker-bce on MIPS64."
Nicolas Geoffray [Mon, 13 Jul 2015 13:56:50 +0000 (13:56 +0000)]
Merge "Remove the --compiler-backend option from script."
Nicolas Geoffray [Mon, 13 Jul 2015 11:56:00 +0000 (11:56 +0000)]
Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""
This reverts commit
327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9.
Change-Id: I0dc5d92e5d1ef98830fbd3c40ec59a93f9e0422d
Nicolas Geoffray [Mon, 13 Jul 2015 13:35:17 +0000 (14:35 +0100)]
Remove the --compiler-backend option from script.
Optimizing is now the default for apps.
Change-Id: I15617b881ac7a5a6fe7a281bfa61446bc60ef65d
Nicolas Geoffray [Mon, 13 Jul 2015 13:28:59 +0000 (13:28 +0000)]
am
77d5e6bf: Merge "Change JIT code to use optimizing."
* commit '
77d5e6bf4ea357d332762cde3aa3321a402eac75':
Change JIT code to use optimizing.
Nicolas Geoffray [Mon, 13 Jul 2015 13:18:41 +0000 (13:18 +0000)]
Merge "Change JIT code to use optimizing."
Roland Levillain [Mon, 13 Jul 2015 12:33:04 +0000 (13:33 +0100)]
Re-enable run-test 449-checker-bce on MIPS64.
Bug:
21555893
Change-Id: I92e11637cc1f8f694e4d4138512cbcf47e22a249
Vladimir Marko [Fri, 26 Jun 2015 11:06:30 +0000 (12:06 +0100)]
ART: Don't nest indenters in oatdump.
Reduces the time taken by the oatdump_test by ~12s (15%)
on host and ~55s (9%) on N5.
Change-Id: I99bb16ff5f3640389815f1fe54379ca64eac071b
Nicolas Geoffray [Mon, 13 Jul 2015 12:05:24 +0000 (12:05 +0000)]
am
f185fb36: Merge "[optimizing] Don\'t rely on the verifier for String.<init>."
* commit '
f185fb365e9faf58428762bace96d7729ea5bdbc':
[optimizing] Don't rely on the verifier for String.<init>.
Nicolas Geoffray [Mon, 13 Jul 2015 12:05:22 +0000 (12:05 +0000)]
am
5e094de2: Merge "Revert "Make dex2dex return a CompiledMethod after quickening.""
* commit '
5e094de24827292d8a13be2adbdcca54ae7d5ff0':
Revert "Make dex2dex return a CompiledMethod after quickening."
Nicolas Geoffray [Mon, 13 Jul 2015 11:55:19 +0000 (11:55 +0000)]
Merge "[optimizing] Don't rely on the verifier for String.<init>."
Nicolas Geoffray [Mon, 13 Jul 2015 11:54:08 +0000 (11:54 +0000)]
Merge "Revert "Make dex2dex return a CompiledMethod after quickening.""
Nicolas Geoffray [Mon, 13 Jul 2015 11:53:56 +0000 (11:53 +0000)]
Revert "Make dex2dex return a CompiledMethod after quickening."
Build failures on arm/arm64.
This reverts commit
6920703c8eae0d90528ea09945e742582b6f8198.
Change-Id: I0dd5426610150937dac6e4d9dd9aa759bdf7fca4
Nicolas Geoffray [Mon, 13 Jul 2015 11:20:43 +0000 (11:20 +0000)]
am
8bf1b566: Merge "Make dex2dex return a CompiledMethod after quickening."
* commit '
8bf1b5668257b50c220c05be5cb1105a9661afba':
Make dex2dex return a CompiledMethod after quickening.
Nicolas Geoffray [Mon, 13 Jul 2015 11:07:18 +0000 (11:07 +0000)]
Merge "Make dex2dex return a CompiledMethod after quickening."
Andreas Gampe [Sat, 11 Jul 2015 06:51:03 +0000 (23:51 -0700)]
ART: Fix arm32 assembly stub CFI
Follow-up to
7ea6a170486d81b127e69673cd1020c4db628c93.
Change-Id: Ib6df28653374994c78cd5586f2381d36b74ca846
Andreas Gampe [Sat, 11 Jul 2015 04:28:43 +0000 (04:28 +0000)]
am
d4da3600: Merge "ART: Add Thread start VLOG"
* commit '
d4da360082e8eadcd12b5030f42a9ba598332471':
ART: Add Thread start VLOG
Andreas Gampe [Sat, 11 Jul 2015 04:15:34 +0000 (04:15 +0000)]
Merge "ART: Add Thread start VLOG"
Andreas Gampe [Fri, 10 Jul 2015 04:53:15 +0000 (21:53 -0700)]
ART: Add Thread start VLOG
Add a stack trace at the time of thread creation or attaching to
the verbose:threads logging.
Change-Id: I5e07c81ce24f145c37ab172eda7bb4c54dad4445
Mathieu Chartier [Sat, 11 Jul 2015 02:54:14 +0000 (02:54 +0000)]
am
ec97825f: Merge "Fix proxy handling in FindDeclaredVirtualMethod"
* commit '
ec97825f8553b3a99b6dfbbb90a50fe65301ea94':
Fix proxy handling in FindDeclaredVirtualMethod
Mathieu Chartier [Sat, 11 Jul 2015 02:42:47 +0000 (02:42 +0000)]
Merge "Fix proxy handling in FindDeclaredVirtualMethod"
Mathieu Chartier [Sat, 11 Jul 2015 01:26:41 +0000 (18:26 -0700)]
Fix proxy handling in FindDeclaredVirtualMethod
Added missing GetInterfaceMethodIfProxy and test.
Fixed formatting.
Bug:
22411819
https://code.google.com/p/android-developer-preview/issues/detail?id=2635
Change-Id: I3eece9c72091bb9d0262aacf0a75ec6908b5f4d2
Mathieu Chartier [Sat, 11 Jul 2015 00:52:49 +0000 (00:52 +0000)]
am
3aec6a37: Merge "Add VMDebug.countInstancesOfClasses"
* commit '
3aec6a37ac110cbbdc1422b8b1d38c4f9ef9bf5a':
Add VMDebug.countInstancesOfClasses
Mathieu Chartier [Sat, 11 Jul 2015 00:38:16 +0000 (00:38 +0000)]
Merge "Add VMDebug.countInstancesOfClasses"
Mathieu Chartier [Fri, 10 Jul 2015 20:19:51 +0000 (13:19 -0700)]
Add VMDebug.countInstancesOfClasses
countInstancesOfClasses allows passing multiple classes unlike
countInstanceOfClass instead of needing to do one at a time.
This is going to be used to speed up string mode checking.
Also changed the logic to not do a GC, this was the old Dalvik
behavior. It is the job of the caller to do this.
Added test.
https://code.google.com/p/android/issues/detail?id=177552
Change-Id: Ia85684f40cf59a52aa71a8479c711a994651209b
Mathieu Chartier [Fri, 10 Jul 2015 22:58:41 +0000 (22:58 +0000)]
am
d6dae315: Merge "Change VisitNativeRoots to use unchecked get for method arrays"
* commit '
d6dae315390e7bbb9e29fbc87e364261e737728f':
Change VisitNativeRoots to use unchecked get for method arrays
Mathieu Chartier [Fri, 10 Jul 2015 22:44:12 +0000 (22:44 +0000)]
Merge "Change VisitNativeRoots to use unchecked get for method arrays"
Mathieu Chartier [Fri, 10 Jul 2015 22:00:20 +0000 (15:00 -0700)]
Change VisitNativeRoots to use unchecked get for method arrays
Fixes some DCHECKs.
Change-Id: I464b599866a09bd4294b7033d69be880821767fb
Mathieu Chartier [Fri, 10 Jul 2015 18:19:19 +0000 (18:19 +0000)]
am
eaffe350: Merge "Fix race condition for method root marking in VisitNativeRoots"
* commit '
eaffe35038dc7b9e9e95ec997d32d19571973f54':
Fix race condition for method root marking in VisitNativeRoots
Mathieu Chartier [Fri, 10 Jul 2015 18:08:56 +0000 (18:08 +0000)]
Merge "Fix race condition for method root marking in VisitNativeRoots"
Mathieu Chartier [Fri, 10 Jul 2015 01:31:35 +0000 (18:31 -0700)]
Fix race condition for method root marking in VisitNativeRoots
Only mark if non null, we may see a non zero length with a null
array due to race conditions with class loading.
Bug:
22077752
Change-Id: Icd37f70482efe320185d46ce4391aa0e0e43ff6f
Nicolas Geoffray [Fri, 10 Jul 2015 16:29:39 +0000 (17:29 +0100)]
Change JIT code to use optimizing.
Obviously, will fall back to quick for most methods currently,
due to lack of -QUICK opcodes support.
Change-Id: I28882fbe805cd907275b6047437d9639a475964a
Aart Bik [Fri, 10 Jul 2015 17:29:44 +0000 (17:29 +0000)]
am
753e36e2: Merge "Enable multi-dex content per file in dexlist/dump."
* commit '
753e36e29a75db786d1dfe0aaeec526cea463c76':
Enable multi-dex content per file in dexlist/dump.
Roland Levillain [Fri, 10 Jul 2015 17:29:43 +0000 (17:29 +0000)]
am
e46d0b50: Merge "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
* commit '
e46d0b50fe63c3d7b7a690d8d367bae2c17a3dfe':
Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."
Aart Bik [Fri, 10 Jul 2015 17:25:39 +0000 (17:25 +0000)]
Merge "Enable multi-dex content per file in dexlist/dump."
Nicolas Geoffray [Fri, 10 Jul 2015 10:38:52 +0000 (11:38 +0100)]
[optimizing] Don't rely on the verifier for String.<init>.
Continue work on cutting the dependency on the verifier.
Change-Id: I0f95b1eb2e10fd8f6bf54817f1202bdf6dfdb0fe
Roland Levillain [Fri, 10 Jul 2015 17:19:29 +0000 (17:19 +0000)]
Merge "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
Roland Levillain [Fri, 10 Jul 2015 17:18:11 +0000 (17:18 +0000)]
Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."
This reverts commit
5cfe61f27ed9203498169355bb95db756486d292.
Change-Id: I9879e76e7f8315cace05700e3b571a6a4749bf1a
Nicolas Geoffray [Thu, 9 Jul 2015 17:15:19 +0000 (18:15 +0100)]
Make dex2dex return a CompiledMethod after quickening.
This is the starting piece of pushing more verification and
dex2dex data into an .oat file, to lower the dependency on verification
results at runtime.
Change-Id: I8e1b49a0207714bc5b84d1f606806718c5c7fb69
Roland Levillain [Fri, 10 Jul 2015 15:19:12 +0000 (15:19 +0000)]
am
404ea410: Merge "Fuse long and FP compare & condition on ARM64 in Optimizing."
* commit '
404ea410c5c1566909ae741582046b7cae2bd681':
Fuse long and FP compare & condition on ARM64 in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 15:10:46 +0000 (15:10 +0000)]
Merge "Fuse long and FP compare & condition on ARM64 in Optimizing."
Roland Levillain [Fri, 10 Jul 2015 11:01:37 +0000 (11:01 +0000)]
am
f4000216: Merge "Fuse long and FP compare & condition on ARM in Optimizing."
* commit '
f40002163fed58215df569e89f0a0b9661e16273':
Fuse long and FP compare & condition on ARM in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 10:51:14 +0000 (10:51 +0000)]
Merge "Fuse long and FP compare & condition on ARM in Optimizing."
Roland Levillain [Fri, 10 Jul 2015 10:20:41 +0000 (10:20 +0000)]
am
f16b820f: Merge "Initialize pDeoptimize quick entry pointer for Mips."
* commit '
f16b820fc18ff86e765a14176f05417305d689a0':
Initialize pDeoptimize quick entry pointer for Mips.
Roland Levillain [Fri, 10 Jul 2015 10:08:06 +0000 (10:08 +0000)]
Merge "Initialize pDeoptimize quick entry pointer for Mips."
Roland Levillain [Fri, 10 Jul 2015 09:38:11 +0000 (10:38 +0100)]
Fuse long and FP compare & condition on ARM64 in Optimizing.
Bug:
21120453
Change-Id: I701e808600fb5ba9ff4d0f5e19e4ce22b1d34b29
Andreas Gampe [Fri, 10 Jul 2015 01:39:15 +0000 (01:39 +0000)]
am
f470eb88: Merge "ART: Change merges with Undefined to Undefined"
* commit '
f470eb88cc3d3654f0fb1ca38622fa3a35fbd8a3':
ART: Change merges with Undefined to Undefined
Andreas Gampe [Fri, 10 Jul 2015 01:27:00 +0000 (01:27 +0000)]
Merge "ART: Change merges with Undefined to Undefined"
Mathieu Chartier [Fri, 10 Jul 2015 00:49:46 +0000 (00:49 +0000)]
am
d65ddd18: Merge "Remove unused WorkStealing thread pool"
* commit '
d65ddd188a94cccabf723c860f0750e33f30cdb3':
Remove unused WorkStealing thread pool
Mathieu Chartier [Fri, 10 Jul 2015 00:37:31 +0000 (00:37 +0000)]
Merge "Remove unused WorkStealing thread pool"
Mathieu Chartier [Thu, 9 Jul 2015 23:58:42 +0000 (16:58 -0700)]
Remove unused WorkStealing thread pool
Bug:
10141986
Change-Id: Id2042320afc91b34b6203e82fb56424281c8d64b
Mathieu Chartier [Thu, 9 Jul 2015 23:54:47 +0000 (23:54 +0000)]
am
07c65d2b: Merge "Clean up some includes"
* commit '
07c65d2b0c7faa6ffc288f538181177809aa5bdb':
Clean up some includes
Mathieu Chartier [Thu, 9 Jul 2015 23:43:48 +0000 (23:43 +0000)]
Merge "Clean up some includes"
Mathieu Chartier [Thu, 9 Jul 2015 22:15:09 +0000 (15:15 -0700)]
Clean up some includes
Change-Id: Ia03a3b54b235df38d5cfe096fef1aebe2b80eb29
Andreas Gampe [Thu, 9 Jul 2015 22:03:01 +0000 (22:03 +0000)]
am
c89216b5: Merge "ART: Improve the symbolize script"
* commit '
c89216b5485fba9a604e3c6dd5101fa4035918eb':
ART: Improve the symbolize script
Andreas Gampe [Thu, 9 Jul 2015 21:50:13 +0000 (21:50 +0000)]
Merge "ART: Improve the symbolize script"
Andreas Gampe [Thu, 9 Jul 2015 21:39:56 +0000 (14:39 -0700)]
ART: Improve the symbolize script
Allow a list of files to pull. This improves turnaround time when
tracking down perf hotspots.
Bug:
21760614
(cherry picked from commit
6f0a9c305b3e51b852fa9f188590076d6612864e)
Change-Id: I824e875053940d59eb00f9d796ef402632905c39
Andreas Gampe [Thu, 9 Jul 2015 18:30:14 +0000 (11:30 -0700)]
ART: Change merges with Undefined to Undefined
The result of a merge with an Undefined type should be Undefined.
Conflicts are allowed to be copied around, but Undefined registers
should not be touched at all, except to be written into.
Add a success test case (the register isn't used) and a fail test
case (the register is tried to be copied).
Bug:
22331663
Bug:
22371999
Change-Id: I9697ce31c1d2ab5aee0433dcf1253bcca79c2983
Andreas Gampe [Thu, 9 Jul 2015 18:49:16 +0000 (18:49 +0000)]
am
f99628f7: Merge "ART: Fix test"
* commit '
f99628f7673c21c42be34f95bef6bbb50cd99f20':
ART: Fix test
Aart Bik [Thu, 9 Jul 2015 18:45:28 +0000 (11:45 -0700)]
Enable multi-dex content per file in dexlist/dump.
Rationale:
Unlike the original Dalvik-based utilities, the Art-based
utilities are able to extract multi-dex content from one file.
So no need for any artificial restriction on number of dex files.
Bug:
22322814
Change-Id: I7c603d22c7e0caa5ae712b905d9bb83982f1b918
Andreas Gampe [Thu, 9 Jul 2015 18:29:36 +0000 (18:29 +0000)]
Merge "ART: Fix test"
Andreas Gampe [Thu, 9 Jul 2015 18:01:07 +0000 (11:01 -0700)]
ART: Fix test
Fixes a breakage from
38536287f61c9c0fc3bab8c1950cf8c74881482a. Ensure
that v4 is not undefined when an exception may be thrown (at the
new-instance).
Bug:
22331663
Bug:
22371999
Change-Id: Ice36ddda5ca92ea32fa88523dd616d4f2a61027e
Calin Juravle [Thu, 9 Jul 2015 14:58:58 +0000 (14:58 +0000)]
am
a51df8a5: Merge "Fix makefile test against host os."
* commit '
a51df8a59f2be2c797a98fb60c6eca9b049412bf':
Fix makefile test against host os.
David Brazdil [Thu, 9 Jul 2015 14:55:26 +0000 (14:55 +0000)]
am
9781bb05: Merge "ART: Fix bug in GraphBuilder"
* commit '
9781bb056ddfaa3a29b4e199357293859b816bb6':
ART: Fix bug in GraphBuilder
Calin Juravle [Thu, 9 Jul 2015 14:52:13 +0000 (14:52 +0000)]
Merge "Fix makefile test against host os."
Calin Juravle [Thu, 9 Jul 2015 14:48:03 +0000 (15:48 +0100)]
Fix makefile test against host os.
Change-Id: I7637845277012a189bf5f3598f9f0b1f599fbf75
David Brazdil [Thu, 9 Jul 2015 14:42:05 +0000 (14:42 +0000)]
Merge "ART: Fix bug in GraphBuilder"
David Brazdil [Thu, 9 Jul 2015 13:36:05 +0000 (14:36 +0100)]
ART: Fix bug in GraphBuilder
This fixes a bug where the GraphBuilder would split a throwing catch
block but would not update info about which blocks throw.
Change-Id: If5415f0c320aa488e06eb042e8fea6f03e30246a
David Brazdil [Thu, 9 Jul 2015 10:48:39 +0000 (10:48 +0000)]
am
7b3d3bc1: Merge "ART: Add regression test"
* commit '
7b3d3bc1a4ea7546e4743e90e695f4fc7ecadf3a':
ART: Add regression test
David Brazdil [Thu, 9 Jul 2015 10:37:09 +0000 (10:37 +0000)]
Merge "ART: Add regression test"
David Brazdil [Wed, 8 Jul 2015 18:13:19 +0000 (19:13 +0100)]
ART: Add regression test
This adds a test for CL I624c0f91676d9baaada6f33be9d7091f68d57535.
Change-Id: Ib9ea1400082ad03c4355983d95268e084c0b6a6e
Sebastien Hertz [Thu, 9 Jul 2015 09:53:06 +0000 (09:53 +0000)]
am
0f40fbc8: Merge "Support compiling run-tests with jack"
* commit '
0f40fbc82722bd75ee04cd7e04580a13a6f79443':
Support compiling run-tests with jack
Sebastien Hertz [Thu, 9 Jul 2015 09:11:35 +0000 (09:11 +0000)]
Merge "Support compiling run-tests with jack"
Andreas Gampe [Thu, 9 Jul 2015 03:33:37 +0000 (03:33 +0000)]
am
224a848b: Merge "ART: Allow to set and copy conflicts in the verifier"
* commit '
224a848b0f55b8a39ec8bfd73786ccd409def0a2':
ART: Allow to set and copy conflicts in the verifier
Andreas Gampe [Thu, 9 Jul 2015 03:02:05 +0000 (03:02 +0000)]
Merge "ART: Allow to set and copy conflicts in the verifier"
Andreas Gampe [Thu, 9 Jul 2015 00:22:57 +0000 (17:22 -0700)]
ART: Allow to set and copy conflicts in the verifier
As long as conflicts are not actively being used, it is OK to set
them in a register line or copy them around.
Bug:
22331663
Change-Id: I61999e2d9c92f9bdedcb0a5dea54df3c5bb130ca
Mathieu Chartier [Wed, 8 Jul 2015 22:00:43 +0000 (22:00 +0000)]
am
0e87d180: Merge "Fix potential bugs in allocation tracker"
* commit '
0e87d1809443d41b431ce3a686b4e074df2d7b8b':
Fix potential bugs in allocation tracker
Ying Wang [Wed, 8 Jul 2015 22:00:42 +0000 (22:00 +0000)]
am
e1f3a6ed: Merge "Have test-art-host-dexdump specifically depend on the host binaries."
* commit '
e1f3a6edc5bb241a11043c8be6b12b856b6cfe89':
Have test-art-host-dexdump specifically depend on the host binaries.
Mathieu Chartier [Wed, 8 Jul 2015 21:46:48 +0000 (21:46 +0000)]
Merge "Fix potential bugs in allocation tracker"
Ying Wang [Wed, 8 Jul 2015 21:46:14 +0000 (21:46 +0000)]
Merge "Have test-art-host-dexdump specifically depend on the host binaries."
Aart Bik [Wed, 8 Jul 2015 21:39:57 +0000 (21:39 +0000)]
am
784c6aee: Merge "Revert "Make Art dexdump/list the real utilities.""
* commit '
784c6aee9cde7fc0e39a9f0c8b93d120e5f6dc3b':
Revert "Make Art dexdump/list the real utilities."
Mathieu Chartier [Wed, 8 Jul 2015 21:39:53 +0000 (21:39 +0000)]
am
2e3fc781: Merge "Use trap + async timeout for tests"
* commit '
2e3fc78177c73569627654b9f90938de8d3b316e':
Use trap + async timeout for tests
Ying Wang [Wed, 8 Jul 2015 21:09:10 +0000 (14:09 -0700)]
Have test-art-host-dexdump specifically depend on the host binaries.
dexdump2 and dexlist2 are phony targets representing both the host and
target binaries.
Also set environmental variable ANDROID_HOST_OUT=$(realpath $(HOST_OUT))
before calling art/test/dexdump/run-all-tests.
art/test/dexdump/run-all-tests references ANDROID_HOST_OUT, which may be
not set up by the user if he didn't run build/envsetup.sh.
Bug:
22343844
Change-Id: I38b5f3efccd5817d7d9ff0e91b5c6d070b546d77
Aart Bik [Wed, 8 Jul 2015 21:21:15 +0000 (21:21 +0000)]
Merge "Revert "Make Art dexdump/list the real utilities.""
Mathieu Chartier [Wed, 8 Jul 2015 21:21:55 +0000 (21:21 +0000)]
Merge "Use trap + async timeout for tests"
Aart Bik [Wed, 8 Jul 2015 21:20:13 +0000 (21:20 +0000)]
Revert "Make Art dexdump/list the real utilities."
This reverts commit
d10ee1ce1ccd92c003ec49c15edf339e74c13894.
REASON:
win_sdk is not happy with my migration :-(
Change-Id: I2ed196da3f5883112883525f883d25b36e48352a
Andreas Gampe [Wed, 8 Jul 2015 21:08:48 +0000 (21:08 +0000)]
am
dffdfb9e: Merge "ART: Avoid soft- after hard-fail in verifier"
* commit '
dffdfb9ecb8c3b0b3faaf0ca204b963410a3a47d':
ART: Avoid soft- after hard-fail in verifier
Mathieu Chartier [Wed, 8 Jul 2015 21:03:02 +0000 (14:03 -0700)]
Use trap + async timeout for tests
Allows tests to be killed with ctrl-c.
Bug:
19414810
Change-Id: I09fbee370e71386ed48b814407868c2fe7a0b058
Andreas Gampe [Wed, 8 Jul 2015 20:56:40 +0000 (20:56 +0000)]
Merge "ART: Avoid soft- after hard-fail in verifier"