OSDN Git Service
Nicolas Geoffray [Wed, 13 May 2015 14:02:55 +0000 (15:02 +0100)]
Remove junit from our core image.
It's not used, and when we run art with vogar, we get
incompatibilities. For example vogar's TestSuite class
is very different than junit's TestSuite.
Change-Id: I45c78d86c09c28b6136a6e50f6a08a746103794a
Nicolas Geoffray [Wed, 13 May 2015 10:16:44 +0000 (10:16 +0000)]
Merge "Do not pass junit.jar to vogar."
Nicolas Geoffray [Wed, 13 May 2015 10:03:19 +0000 (11:03 +0100)]
Do not pass junit.jar to vogar.
Not needed after https://android-review.googlesource.com/#/c/150563.
Also dex2oat now complains about duplicated classes, and fallbacks
to the interpreter if it sees any. Since vogar has its own junit,
dex2oat was complaining.
Change-Id: I579feb0b1a049af3fba664fd2d86c67c66c8eae1
Mathieu Chartier [Tue, 12 May 2015 22:17:47 +0000 (22:17 +0000)]
Merge "Hold heap bitmap lock in Heap::GetObjectsAllocated"
Mathieu Chartier [Tue, 12 May 2015 17:47:11 +0000 (10:47 -0700)]
Hold heap bitmap lock in Heap::GetObjectsAllocated
Fixes a race condition where add and remove space could cause a crash
when we iterated over the spaces.
TODO: Add a spaces lock or something to guard against this.
(cherry picked from commit
a395c0a492079d86b312c9edc796d63001576954)
Bug:
21031927
Change-Id: I7f0d558316f8e9d9f22ffd182e8666355bf50d47
Jeff Hao [Tue, 12 May 2015 21:46:16 +0000 (21:46 +0000)]
Merge "Add test for String init called from unresolvable class."
Vladimir Marko [Tue, 12 May 2015 21:37:35 +0000 (21:37 +0000)]
Merge "Quick: Fix DCE, clear high word flag in RemoveChange()."
Vladimir Marko [Tue, 12 May 2015 21:27:21 +0000 (22:27 +0100)]
Quick: Fix DCE, clear high word flag in RemoveChange().
Bug:
20640451
Change-Id: Ibab707ff8e60816b9871c3f4096c0bbbf535cbe8
Jeff Hao [Tue, 12 May 2015 01:39:28 +0000 (18:39 -0700)]
Add test for String init called from unresolvable class.
Bug:
20971268
(cherry-picked from
f450cf6b06255ead0a43a9e94dc2f2175e6f9849)
Change-Id: I810f599b38a46e738bcacb15ca3c4537e1fb7b77
Hiroshi Yamauchi [Tue, 12 May 2015 21:11:53 +0000 (21:11 +0000)]
Merge "Add notes about fast JNI calls."
Hiroshi Yamauchi [Tue, 12 May 2015 19:16:10 +0000 (12:16 -0700)]
Add notes about fast JNI calls.
Bug:
19665903
Change-Id: Ie0610aa17ab1365c08cb0b5b0931a8cefb65f252
Richard Uhler [Tue, 12 May 2015 19:36:48 +0000 (19:36 +0000)]
Merge "Fix bug in removal of *.flock files."
Andreas Gampe [Tue, 12 May 2015 18:26:24 +0000 (18:26 +0000)]
Merge "ART: arm indexOf intrinsics for the optimizing compiler"
Richard Uhler [Thu, 7 May 2015 17:19:35 +0000 (10:19 -0700)]
Fix bug in removal of *.flock files.
Bug:
20816098
Change-Id: I72ee32884f32af43a54518c9b9772f63957ab5de
Vladimir Marko [Tue, 12 May 2015 18:16:58 +0000 (18:16 +0000)]
Merge "Quick: Fix DCE to mark wide register overlaps correctly."
Hiroshi Yamauchi [Tue, 12 May 2015 17:48:26 +0000 (17:48 +0000)]
Merge "Re-enable 098-ddmc for the read barrier config."
Vladimir Marko [Tue, 12 May 2015 17:27:20 +0000 (18:27 +0100)]
Quick: Fix DCE to mark wide register overlaps correctly.
Previously we missed some cases of overlap with registers
coming from previous blocks.
Bug:
20640451
Change-Id: I4b32a7aaea2dea1b0b9560ae3459a4d903683f20
David Brazdil [Tue, 12 May 2015 17:14:21 +0000 (17:14 +0000)]
Merge "ART: Rediscover loops after deleting blocks in DCE"
David Brazdil [Tue, 12 May 2015 17:12:57 +0000 (17:12 +0000)]
Merge "ART: Split Checker into smaller files"
David Brazdil [Tue, 12 May 2015 17:06:38 +0000 (18:06 +0100)]
ART: Split Checker into smaller files
Checker code has become too messy and incomprehensible. This patch
splits it into more manageable and better structured units.
Functionality remains unchanged.
Resubmission of change I870c69827d2be2d09196a51382a3f47f31cd2ba3 due
to omission of file 'tools/checker/file_format/common.py'.
Change-Id: I277a4aa65a2e3b54f0e89901fdb9f289f55a325f
David Brazdil [Tue, 12 May 2015 16:56:00 +0000 (16:56 +0000)]
Merge "Revert "ART: Split Checker into smaller files""
David Brazdil [Tue, 12 May 2015 16:55:01 +0000 (16:55 +0000)]
Revert "ART: Split Checker into smaller files"
This reverts commit
a490be5dd95982f77ff1447bea9ee06604038a96.
Change-Id: Ic3b7cf172200caced9ae2f10d2f200447e6801ee
David Brazdil [Tue, 12 May 2015 16:11:55 +0000 (16:11 +0000)]
Merge "ART: Split Checker into smaller files"
David Brazdil [Tue, 28 Apr 2015 12:53:59 +0000 (13:53 +0100)]
ART: Split Checker into smaller files
Checker code has become too messy and incomprehensible. This patch
splits it into more manageable and better structured units.
Functionality remains unchanged.
Change-Id: I870c69827d2be2d09196a51382a3f47f31cd2ba3
Andreas Gampe [Fri, 8 May 2015 05:31:55 +0000 (22:31 -0700)]
ART: arm indexOf intrinsics for the optimizing compiler
Add intrinsics implementations for indexOf in the optimizing
compiler. These are mostly ported from Quick.
Bug:
20889065
Change-Id: I18ee849d41187a381f99529669e6f97040aaacf6
Roland Levillain [Tue, 12 May 2015 14:01:03 +0000 (14:01 +0000)]
Merge "Small correction in Optimizing's ARM64 code generator."
Calin Juravle [Tue, 12 May 2015 12:41:16 +0000 (12:41 +0000)]
Merge "Revert "Add new rule to the graph checker.""
Calin Juravle [Tue, 12 May 2015 12:40:07 +0000 (12:40 +0000)]
Revert "Add new rule to the graph checker."
This reverts commit
9d50775046a51941f86cced03593c61c89ae615e.
Change-Id: I9533116bbaef5fd5d2944c4ebebd2f01b0047e34
Calin Juravle [Tue, 12 May 2015 11:53:49 +0000 (11:53 +0000)]
Merge "Add new rule to the graph checker."
David Brazdil [Thu, 7 May 2015 08:59:30 +0000 (09:59 +0100)]
ART: Rediscover loops after deleting blocks in DCE
The way DCE currently updates loop information does not cover all
cases. This patch removes the logic, resets loop information of live
blocks to pre-SSA state and reanalyzes the affected loops.
Change-Id: I0b996a70235b95a8db0de9a23a03f71db57a21b8
Roland Levillain [Tue, 12 May 2015 09:47:34 +0000 (09:47 +0000)]
Merge "Simplify floating-point comparisons with NaN in Optimizing."
David Brazdil [Tue, 12 May 2015 09:43:17 +0000 (09:43 +0000)]
Merge "ART: Enable Checker annotations in smali files"
David Brazdil [Tue, 12 May 2015 09:37:59 +0000 (10:37 +0100)]
ART: Enable Checker annotations in smali files
Change-Id: I8eeb76154b5aa5506fc477d38cb56cae168cdc90
Nicolas Geoffray [Tue, 12 May 2015 08:28:33 +0000 (08:28 +0000)]
Merge "Update test expectations."
Nicolas Geoffray [Tue, 12 May 2015 08:27:19 +0000 (09:27 +0100)]
Update test expectations.
Change-Id: Ic0eb5e656fb81e3e8754131296715c75a6faf358
Hiroshi Yamauchi [Tue, 12 May 2015 00:37:19 +0000 (17:37 -0700)]
Re-enable 098-ddmc for the read barrier config.
Bug:
20720510
Bug:
12687968
Change-Id: I6e5c61a88bfce15231c1476bc0edc28ae53d081f
Sebastien Hertz [Mon, 11 May 2015 18:58:31 +0000 (18:58 +0000)]
Merge "Remove unused StackHandleScope"
Hiroshi Yamauchi [Mon, 11 May 2015 18:04:09 +0000 (18:04 +0000)]
Merge "Insert a read barrier in the JNI bridge."
Richard Uhler [Mon, 11 May 2015 17:46:44 +0000 (17:46 +0000)]
Merge "Fix typo in VLOG message."
Richard Uhler [Mon, 11 May 2015 17:46:06 +0000 (17:46 +0000)]
Merge "Add more diagnostics info to flaky oat file assistant test."
Andreas Gampe [Mon, 11 May 2015 17:42:21 +0000 (17:42 +0000)]
Merge "ART: x86 indexOf intrinsics for the optimizing compiler"
Andreas Gampe [Thu, 7 May 2015 21:46:15 +0000 (14:46 -0700)]
ART: x86 indexOf intrinsics for the optimizing compiler
Add intrinsics implementations for indexOf in the optimizing
compiler. These are mostly ported from Quick. Add instruction
support to assemblers where necessary.
Change-Id: Ife90ed0245532a5c436a26fe84715dc357f353c8
Calin Juravle [Mon, 11 May 2015 17:25:51 +0000 (18:25 +0100)]
Add new rule to the graph checker.
Phis typed as `reference` should not have equivalents after building the
SSA.
Change-Id: I9cac189362583ef7c9c7defd3da7338f419f2f94
Sebastien Hertz [Mon, 11 May 2015 15:53:27 +0000 (17:53 +0200)]
Remove unused StackHandleScope
It is causing crashes when there is no current thread (because it has
been detached from the runtime). It happens when we sanity check the
stack during runtime shutdown after stopping method tracing.
Bug:
20993343
Change-Id: I549664932f513a01339e5b1c34b3ddc5744888c3
Richard Uhler [Mon, 11 May 2015 16:36:57 +0000 (09:36 -0700)]
Fix typo in VLOG message.
Change-Id: Iaf4ce1787816afce947c6e963df19d20ef5f5e1b
Richard Uhler [Mon, 11 May 2015 16:32:47 +0000 (09:32 -0700)]
Add more diagnostics info to flaky oat file assistant test.
Change-Id: Ifd0029d389ba7585a819c01fc9cc846681d0a349
Nicolas Geoffray [Mon, 11 May 2015 15:29:41 +0000 (15:29 +0000)]
Merge "Add a flag to StackVisitor for inlining."
Nicolas Geoffray [Wed, 6 May 2015 10:34:34 +0000 (11:34 +0100)]
Add a flag to StackVisitor for inlining.
The flag tells whether the stack walk needs to include inlined
Java frames.
This does not do anything just yet, as we're not inlining anyways.
Change-Id: I716e25094fe56fa335ca1f9a398c1bcdba478e73
Roland Levillain [Mon, 11 May 2015 13:37:09 +0000 (13:37 +0000)]
Merge "[optimizing] Improve 32 bit long shift by 1."
Nicolas Geoffray [Mon, 11 May 2015 13:18:05 +0000 (13:18 +0000)]
Merge "Add a parent environment to HEnvironment."
Nicolas Geoffray [Thu, 7 May 2015 10:57:35 +0000 (11:57 +0100)]
Add a parent environment to HEnvironment.
This code has no functionality change. It adds a placeholder
for chaining inlined frames.
Change-Id: I5ec57335af76ee406052345b947aad98a6a4423a
Mark Mendell [Wed, 6 May 2015 01:34:03 +0000 (21:34 -0400)]
[optimizing] Improve 32 bit long shift by 1.
Also change FOO << 1 to FOO+FOO in the instruction simplifier. This is
an architecture independent simplification, which helps 'long << 1' for
32 bit architectures.
Generate an add/adc for long << 1 in x86, in case something is generated
after the simplifier.
Add test cases for the simplification.
Change-Id: I0d512331ef13cc4ccf10c80f11c370a10ed02294
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Nicolas Geoffray [Sat, 9 May 2015 14:17:51 +0000 (14:17 +0000)]
Merge "[optimizing] Tune some x86_64 moves"
Mathieu Chartier [Sat, 9 May 2015 00:07:34 +0000 (00:07 +0000)]
Merge "Don't allow JIT to compile native methods"
Mathieu Chartier [Sat, 9 May 2015 00:05:01 +0000 (17:05 -0700)]
Don't allow JIT to compile native methods
Change-Id: I12722309ba52c430e23ab862b29f7a48383f00d2
Andreas Gampe [Fri, 8 May 2015 23:22:24 +0000 (23:22 +0000)]
Merge "Add stub_test implementation for mips & mips64"
Andreas Gampe [Fri, 8 May 2015 23:21:03 +0000 (23:21 +0000)]
Merge "Fix stub_test for Mips64"
Goran Jakovljevic [Thu, 23 Apr 2015 13:27:23 +0000 (15:27 +0200)]
Fix stub_test for Mips64
Force ENTRY macro to load GP. Instead .cpload (used for o32 abi,
not working for n64) use .cpsetup to set up GP and save previous
GP value.
Fix expectations in GetSet32Static.
Change-Id: Ie97e32fa2fee7a6e8bae6bc36e78976b8be62b79
Mathieu Chartier [Fri, 8 May 2015 23:19:41 +0000 (23:19 +0000)]
Merge "Check IsReferenceVReg during deopt"
Mathieu Chartier [Fri, 8 May 2015 21:19:26 +0000 (14:19 -0700)]
Check IsReferenceVReg during deopt
Required since the quick GC maps may not agree with the verifier
ones. Without this check we may copy stale object references into
the shadow frame.
(cherry picked from commit
f00baf56ef647684888a407dbb6adadd704a2039)
Bug:
20736048
Change-Id: I7783c8a8ee45cf601b08b4c38f1dec7f7d11380c
Vladimir Marko [Fri, 8 May 2015 21:26:37 +0000 (21:26 +0000)]
Merge "ART: Merge entries with same name and protect in MemMap dump."
Vladimir Marko [Fri, 8 May 2015 14:17:32 +0000 (15:17 +0100)]
ART: Merge entries with same name and protect in MemMap dump.
This should make the MemMap dump less chatty and allow the
logger to keep more relevant output.
Bug:
20873174
Change-Id: I09058798faa8f79d154cee5008017b03700df8db
Calin Juravle [Fri, 8 May 2015 15:52:48 +0000 (15:52 +0000)]
Merge "Skip compilation when falling-through out of method code."
Richard Uhler [Fri, 8 May 2015 15:24:25 +0000 (15:24 +0000)]
Merge "Fix typo in comments."
Roland Levillain [Fri, 8 May 2015 12:13:19 +0000 (13:13 +0100)]
Simplify floating-point comparisons with NaN in Optimizing.
This change was suggested by Ian.
Also, simplify some art::HFloatConstant and
art::HDoubleConstant methods.
Change-Id: I7908df23581a7f61c8ec79c290fe5f70798ac3be
Vladimir Marko [Fri, 8 May 2015 10:31:05 +0000 (10:31 +0000)]
Merge "ART: Fix debug output for bad reused MemMap."
Vladimir Marko [Fri, 8 May 2015 10:10:16 +0000 (11:10 +0100)]
ART: Fix debug output for bad reused MemMap.
Log the error_msg instead of a pointer to it.
Raise the log level to ERROR for the process maps.
Change-Id: I95f82f013d1c6360f40e6315652d1a2dda0f39e2
Andreas Gampe [Fri, 8 May 2015 00:17:56 +0000 (00:17 +0000)]
Merge "ART: Refactor 082-inline-execute"
Andreas Gampe [Thu, 7 May 2015 23:44:58 +0000 (16:44 -0700)]
ART: Refactor 082-inline-execute
Refactor the indexOf intrinsics tests so that the optimizing
compiler would actually compile them.
Bug:
20889065
Change-Id: I69bfda7fa3eb4ce42c593203731e3ddd61f7e1ed
Hiroshi Yamauchi [Thu, 7 May 2015 17:47:27 +0000 (10:47 -0700)]
Insert a read barrier in the JNI bridge.
Bug:
20720510
Bug:
12687968
Change-Id: Ia9edb614853bad45ec25d6e2142361a8bda1eccf
Richard Uhler [Thu, 7 May 2015 17:52:28 +0000 (10:52 -0700)]
Fix typo in comments.
Change-Id: I6569c0fdc878f797b37509432b59b0d5c9bc5533
Vladimir Marko [Thu, 7 May 2015 17:21:51 +0000 (17:21 +0000)]
Merge "Quick: Fix DCE to rename SSA regs for degenerate Phis."
Vladimir Marko [Thu, 7 May 2015 17:21:31 +0000 (17:21 +0000)]
Merge "Quick: Abolish kMirOpCheckPart2."
Mark Mendell [Thu, 7 May 2015 15:25:03 +0000 (11:25 -0400)]
[optimizing] Tune some x86_64 moves
Generate Moves of constant FP values by loading from the constant table.
Use 'movl' to load a 64 bit register for positive 32-bit values, saving
a byte in the generated code by taking advantage of the implicit
zero extension.
Change a couple of xorq(reg, reg) to xorl to (potentially) save a byte
of code per xor.
Change-Id: I5b2a807f0d3b29294fd4e7b8ef6d654491fa0b01
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Sebastien Hertz [Thu, 7 May 2015 16:10:43 +0000 (16:10 +0000)]
Merge "Support multiple instrumentation clients"
Sebastien Hertz [Wed, 1 Apr 2015 14:34:17 +0000 (16:34 +0200)]
Support multiple instrumentation clients
Changes Instrumentation::ConfigureStubs to support multiple clients
that need different levels of instrumenation. A client is identified
by a string key used to save the desired instrumentation level.
Also adds regression gtest instrumentation_test and some cleanup.
Bug:
19829329
Change-Id: I1fc24a86fcb7cb46d4be806895376c25cc0a0b3c
Sebastien Hertz [Thu, 7 May 2015 15:45:17 +0000 (15:45 +0000)]
Merge "Remove unused InvokeWithShadowFrame"
Sebastien Hertz [Thu, 7 May 2015 15:23:16 +0000 (17:23 +0200)]
Remove unused InvokeWithShadowFrame
This is an artifact of the Portable compiler, probably left after its
removal https://android-review.googlesource.com/119049.
Change-Id: I7f6caa008e37e7a93792840c79713e90d0c7e1e1
Goran Jakovljevic [Wed, 22 Apr 2015 12:10:53 +0000 (14:10 +0200)]
Add stub_test implementation for mips & mips64
Change-Id: I1c2f6633ff78f7d453ba90e96c26df5a79a5b207
Vladimir Marko [Thu, 7 May 2015 11:25:40 +0000 (12:25 +0100)]
Quick: Abolish kMirOpCheckPart2.
The tricks played with kMirOpCheckPart2 are making the
native GC map generation unnecessarily complex. They have
caused problems in the past and now there is bad interaction
with the DCE. Rather than fixing it time and again, remove
the pseudo-insn.
(The whole purpose of those tricks seems to be to allow the
register tracking to be used for the throwing insn before
resetting the tracking for the next block. However, it's
questionable whether that's better than processing the
throwing insn with the subsequent instructions.)
Bug:
20736048
Change-Id: I4767e4609914d3b6990da4416e5093e4ca209780
Narayan Kamath [Thu, 7 May 2015 14:54:45 +0000 (14:54 +0000)]
Merge "Fix broken checks in IsValidPartOfMemberNameUtf8Slow."
Vladimir Marko [Thu, 7 May 2015 14:53:41 +0000 (15:53 +0100)]
Quick: Fix DCE to rename SSA regs for degenerate Phis.
If we're inserting a new Phi and all its inputs are the same
SSA reg (for example, we allow a single-input Phi), some
subsequent insn may actually refer to that reg, so we need
to rename it to keep the graph in a consistent state.
Change-Id: Ic6a1907c3138f4a7d3b13f9e58e9107ca2d92f17
Sebastien Hertz [Thu, 7 May 2015 14:22:34 +0000 (14:22 +0000)]
Merge "JDWP: properly combine location events"
Narayan Kamath [Wed, 6 May 2015 13:55:43 +0000 (14:55 +0100)]
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
GetUtf16FromUtf8 returns a surrogate pair only if it encounters
a 4-byte UTF sequence. Three byte UTF sequences will only return the
first or second half of a pair so we need to check for that
explicitly.
bug:
20844537
(cherry picked from commit
3ba8671d60061359fd833f60f7a9dca14878cc0b)
Change-Id: I2e2a4f9f736cd11050a2b634b3bb27b75a0ee0ba
Nicolas Geoffray [Thu, 7 May 2015 10:57:03 +0000 (10:57 +0000)]
Merge "Use a growable array instead of an environment during SSA."
Nicolas Geoffray [Thu, 7 May 2015 10:46:05 +0000 (11:46 +0100)]
Use a growable array instead of an environment during SSA.
Using an environment was convenient because it contains
a growable array. But there's no need for the environment
abstraction when being used as a temporary holder for values
of locals.
Change-Id: Idf2883fe4b8f97a31ee70b3627c1bdd23ebfff0e
Nicolas Geoffray [Thu, 7 May 2015 08:57:23 +0000 (08:57 +0000)]
Merge "Relax the only one back-edge restriction."
Nicolas Geoffray [Tue, 5 May 2015 16:02:20 +0000 (17:02 +0100)]
Relax the only one back-edge restriction.
The rule is in the way for better register allocation, as
it creates an artificial join point between multiple paths.
Change-Id: Ia4392890f95bcea56d143138f28ddce6c572ad58
Nicolas Geoffray [Thu, 7 May 2015 08:15:41 +0000 (08:15 +0000)]
Merge "No need to relocate the core image for the art script."
Andreas Gampe [Thu, 7 May 2015 03:50:01 +0000 (03:50 +0000)]
Merge "ART: Fix mips64 jni bugs."
Douglas Leung [Fri, 1 May 2015 02:22:49 +0000 (19:22 -0700)]
ART: Fix mips64 jni bugs.
For mips64, 32-bits loads can be zero extended or sign extended to
64-bits. The extension type must match the data type to be loaded.
Also re-enable mips64 generic jni testing.
Change-Id: I9cabaf80b4fde63d9868fccd74593b36d1c324e8
Jeff Hao [Thu, 7 May 2015 01:29:19 +0000 (01:29 +0000)]
Merge "In quick compiler, force string init invoke to be fast path."
Jeff Hao [Thu, 7 May 2015 00:41:32 +0000 (17:41 -0700)]
In quick compiler, force string init invoke to be fast path.
Was running into an issue where a secondary dex file was falling back on
the quick compiler, and IsFastInvoke returned 0 because the
referrer_class was nullptr, causing the string init to be slow path. The
string init technically does not have to be fast path, but there's no
reason to duplicate the logic to call off a thread pointer on the slow
path.
Bug:
20870917
(cherry picked from commit I47e1524d939eb7e9b1da8186092fafc6e925009e)
Change-Id: Ieacd965943759de2b075c30e03cf0a71863f499e
Andreas Gampe [Wed, 6 May 2015 23:53:00 +0000 (23:53 +0000)]
Merge "Fix mips64 bugs."
Nicolas Geoffray [Wed, 6 May 2015 17:38:19 +0000 (18:38 +0100)]
No need to relocate the core image for the art script.
Change-Id: Idd540175e197602e318eeb3764f552372aadce1f
Vladimir Marko [Wed, 6 May 2015 15:19:23 +0000 (15:19 +0000)]
Merge "Quick: Inline synthetic accessors generated by jack."
Vladimir Marko [Wed, 6 May 2015 13:09:04 +0000 (14:09 +0100)]
Quick: Inline synthetic accessors generated by jack.
While javac names synthetic accessors "access$nnn", jack
names them "-getN", "-putN" and "-wrapN". For simplicity,
treat all methods starting with "-" as synthetic accessors.
Bug:
20873367
Change-Id: I67990a6c2ef1d25dafe460ef70143a113bb5b7da
Nicolas Geoffray [Wed, 6 May 2015 14:02:23 +0000 (14:02 +0000)]
Merge "Bump jdwp timeout to 12 minutes."
Nicolas Geoffray [Wed, 6 May 2015 13:57:09 +0000 (14:57 +0100)]
Bump jdwp timeout to 12 minutes.
A run on volantis now is around 10 minutes.
Change-Id: I6e1f436d71da6eec55e984f7af99ba34438e49fb
Nicolas Geoffray [Wed, 6 May 2015 08:23:00 +0000 (08:23 +0000)]
Merge "Re-enable JDWP tests on volantis."