diff options
author | Lang Hames <lhames@gmail.com> | 2016-08-30 19:56:15 +0000 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2016-08-30 19:56:15 +0000 |
commit | d63c86590646b037f8cef875237edfbd2fcc6530 (patch) | |
tree | ea17a2b80bac39a775aefb34a17583550d5174d1 /llvm/unittests/ExecutionEngine/Orc | |
parent | b2081648b2364db17042a6e8e399f663ea8cdcb7 (diff) | |
download | bcm5719-llvm-d63c86590646b037f8cef875237edfbd2fcc6530.tar.gz bcm5719-llvm-d63c86590646b037f8cef875237edfbd2fcc6530.zip |
Re-instate recent RPC updates (r280016, r280017, r280027, r280051) with a
workaround for the limitations of MSVC 2013's std::future class.
llvm-svn: 280141
Diffstat (limited to 'llvm/unittests/ExecutionEngine/Orc')
-rw-r--r-- | llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp b/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp index 7d55641e4ce..babea5ca73a 100644 --- a/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp @@ -83,7 +83,7 @@ TEST_F(DummyRPC, TestAsyncVoidBool) { QueueChannel C2(Q2, Q1); // Make an async call. - auto ResOrErr = callAsyncWithSeq<VoidBool>(C1, true); + auto ResOrErr = callNBWithSeq<VoidBool>(C1, true); EXPECT_TRUE(!!ResOrErr) << "Simple call over queue failed"; { @@ -102,8 +102,8 @@ TEST_F(DummyRPC, TestAsyncVoidBool) { } // Verify that the function returned ok. - auto Val = ResOrErr->first.get(); - EXPECT_TRUE(Val) << "Remote void function failed to execute."; + auto Err = ResOrErr->first.get(); + EXPECT_FALSE(!!Err) << "Remote void function failed to execute."; } TEST_F(DummyRPC, TestAsyncIntInt) { @@ -112,7 +112,7 @@ TEST_F(DummyRPC, TestAsyncIntInt) { QueueChannel C2(Q2, Q1); // Make an async call. - auto ResOrErr = callAsyncWithSeq<IntInt>(C1, 21); + auto ResOrErr = callNBWithSeq<IntInt>(C1, 21); EXPECT_TRUE(!!ResOrErr) << "Simple call over queue failed"; { @@ -143,7 +143,7 @@ TEST_F(DummyRPC, TestSerialization) { // Make a call to Proc1. std::vector<int> v({42, 7}); - auto ResOrErr = callAsyncWithSeq<AllTheTypes>( + auto ResOrErr = callNBWithSeq<AllTheTypes>( C1, -101, 250, -10000, 10000, -1000000000, 1000000000, -10000000000, 10000000000, true, "foo", v); EXPECT_TRUE(!!ResOrErr) << "Big (serialization test) call over queue failed"; @@ -179,8 +179,8 @@ TEST_F(DummyRPC, TestSerialization) { } // Verify that the function returned ok. - auto Val = ResOrErr->first.get(); - EXPECT_TRUE(Val) << "Remote void function failed to execute."; + auto Err = ResOrErr->first.get(); + EXPECT_FALSE(!!Err) << "Remote void function failed to execute."; } // Test the synchronous call API. |