Skip to content

Commit

Permalink
limit default tests to sm
Browse files Browse the repository at this point in the history
- tcp isn't necessarily available depending on how Mercury and it's
  dependencies were compiled
  • Loading branch information
carns committed Oct 27, 2021
1 parent c81778d commit 5b08413
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
12 changes: 3 additions & 9 deletions tests/margo-test-sleep.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,10 @@ int main(int argc, char** argv)
/* use a single pool for progress and sleeper threads */
/* NOTE: we don't use RPC handlers, so no need for an RPC pool */
/***************************************/
mid = margo_init("tcp", MARGO_CLIENT_MODE, 0, 0);
// margo_set_log_level(mid, MARGO_LOG_TRACE);

mid = margo_init("sm", MARGO_CLIENT_MODE, 0, 0);
if (mid == MARGO_INSTANCE_NULL) {
/* if tcp didn't work, try sm */
mid = margo_init("sm", MARGO_CLIENT_MODE, 0, 0);
if (mid == MARGO_INSTANCE_NULL) {
fprintf(stderr, "Error: margo_init()\n");
return (-1);
}
fprintf(stderr, "Error: margo_init()\n");
return (-1);
}

/* retrieve current pool to use for ULT creation */
Expand Down
2 changes: 1 addition & 1 deletion tests/unit-tests/margo-addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ static MunitResult test_margo_addr_lookup(const MunitParameter params[], void* d
}

static char* protocol_params[] = {
"na+sm", "ofi+tcp", NULL
"na+sm", NULL
};

static MunitParameterEnum test_params[] = {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit-tests/margo-init.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static MunitResult init_cycle_client(const MunitParameter params[], void* data)
}

static char* protocol_params[] = {
"na+sm", "ofi+tcp", NULL
"na+sm", NULL
};

static char* use_progress_thread_params[] = {
Expand Down

0 comments on commit 5b08413

Please sign in to comment.