A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revalidate tests, now that detached sends are not cancelled anymore.
[simgrid.git]
/
teshsuite
/
s4u
/
activity-lifecycle
/
activity-lifecycle.cpp
diff --git
a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
index
cb50c68
..
be1e495
100644
(file)
--- a/
teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
+++ b/
teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
@@
-271,16
+271,10
@@
static void test_comm_dsend_and_quit_put_before_get()
simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
assert_exit(false, 3);
simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
assert_exit(false, 3);
- bool got_exception = false;
simgrid::s4u::this_actor::sleep_for(2);
simgrid::s4u::this_actor::sleep_for(2);
- try {
- void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
- xbt_free(payload);
- } catch (xbt_ex const& e) {
- got_exception = true;
- }
+ void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+ xbt_free(payload);
recv_done = true;
recv_done = true;
- xbt_assert(not got_exception);
return;
});
return;
});
@@
-297,7
+291,7
@@
static void test_comm_dsend_and_quit_get_before_put()
bool recv_done = false;
simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&dsend_done]() {
bool recv_done = false;
simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&dsend_done]() {
-
//
assert_exit(false, 2);
+ assert_exit(false, 2);
char* payload = xbt_strdup("toto");
simgrid::s4u::this_actor::sleep_for(2);
simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach();
char* payload = xbt_strdup("toto");
simgrid::s4u::this_actor::sleep_for(2);
simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach();
@@
-306,16
+300,10
@@
static void test_comm_dsend_and_quit_get_before_put()
});
simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
});
simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
- //assert_exit(false, 3);
- bool got_exception = false;
- try {
- void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
- xbt_free(payload);
- } catch (xbt_ex const& e) {
- got_exception = true;
- }
+ assert_exit(false, 3);
+ void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+ xbt_free(payload);
recv_done = true;
recv_done = true;
- xbt_assert(not got_exception);
return;
});
return;
});