summaryrefslogtreecommitdiffstats
path: root/compiler/optimizing
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2015-01-16 09:11:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-16 09:11:54 +0000
commit36740379b9b1c81b7eb06ea9c9df411d0a9a765e (patch)
tree3b56f57b40ae035fc73629a347d15d083a0a0b20 /compiler/optimizing
parent6a5f5b25b3866966175859bc20216c5519d8b029 (diff)
parent6450d14f4f3da6fcb519a0bb948acc8cd274d5a3 (diff)
downloadart-36740379b9b1c81b7eb06ea9c9df411d0a9a765e.tar.gz
art-36740379b9b1c81b7eb06ea9c9df411d0a9a765e.tar.bz2
art-36740379b9b1c81b7eb06ea9c9df411d0a9a765e.zip
Merge "Remove test that is now invalid."
Diffstat (limited to 'compiler/optimizing')
-rw-r--r--compiler/optimizing/parallel_move_test.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/compiler/optimizing/parallel_move_test.cc b/compiler/optimizing/parallel_move_test.cc
index 210f7d7f09..7ab41b6ddc 100644
--- a/compiler/optimizing/parallel_move_test.cc
+++ b/compiler/optimizing/parallel_move_test.cc
@@ -120,16 +120,9 @@ TEST(ParallelMoveTest, Swap) {
{
TestParallelMoveResolver resolver(&allocator);
- static constexpr size_t moves[][2] = {{0, 1}, {1, 2}, {2, 3}, {3, 4}, {4, 1}};
+ static constexpr size_t moves[][2] = {{0, 1}, {1, 2}, {2, 3}, {3, 4}, {4, 0}};
resolver.EmitNativeCode(BuildParallelMove(&allocator, moves, arraysize(moves)));
- ASSERT_STREQ("(4 <-> 1) (3 <-> 4) (2 <-> 3) (0 -> 1)", resolver.GetMessage().c_str());
- }
-
- {
- TestParallelMoveResolver resolver(&allocator);
- static constexpr size_t moves[][2] = {{0, 1}, {1, 2}, {2, 3}, {3, 4}, {4, 1}, {5, 4}};
- resolver.EmitNativeCode(BuildParallelMove(&allocator, moves, arraysize(moves)));
- ASSERT_STREQ("(4 <-> 1) (3 <-> 4) (2 <-> 3) (0 -> 1) (5 -> 4)", resolver.GetMessage().c_str());
+ ASSERT_STREQ("(4 <-> 0) (3 <-> 4) (2 <-> 3) (1 <-> 2)", resolver.GetMessage().c_str());
}
}