From 583bb42739304e05df7c53e93f8d1142740b871d Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 10 Feb 2010 18:29:01 +0000 Subject: [PATCH] - Adapt for changed opal_init() arguments -- takes argc&argv It's orte/constants.h not orte/orte_constants.h This commit was SVN r22594. --- test/dss/dss_buffer.c | 2 +- test/dss/dss_cmp.c | 2 +- test/dss/dss_copy.c | 2 +- test/dss/dss_payload.c | 2 +- test/dss/dss_print.c | 2 +- test/dss/dss_release.c | 2 +- test/dss/dss_set_get.c | 2 +- test/dss/dss_size.c | 2 +- test/runtime/opal_init_finalize.c | 2 +- test/util/opal_error.c | 4 ++-- test/util/opal_if.c | 2 +- test/util/opal_os_create_dirpath.c | 2 +- test/util/opal_os_path.c | 2 +- test/util/opal_timer.c | 2 +- test/util/orte_session_dir.c | 3 +-- test/util/orte_universe_setup_file_io.c | 2 +- 16 files changed, 17 insertions(+), 18 deletions(-) diff --git a/test/dss/dss_buffer.c b/test/dss/dss_buffer.c index 33f7158a83..ee12fc48ce 100644 --- a/test/dss/dss_buffer.c +++ b/test/dss/dss_buffer.c @@ -52,7 +52,7 @@ FILE *test_out; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/dss/dss_cmp.c b/test/dss/dss_cmp.c index acc5ba84e7..ac60b5fe5b 100644 --- a/test/dss/dss_cmp.c +++ b/test/dss/dss_cmp.c @@ -54,7 +54,7 @@ FILE *test_out; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/dss/dss_copy.c b/test/dss/dss_copy.c index 28812fa099..8f8e9ec2af 100644 --- a/test/dss/dss_copy.c +++ b/test/dss/dss_copy.c @@ -48,7 +48,7 @@ FILE *test_out; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/dss/dss_payload.c b/test/dss/dss_payload.c index 494126a975..36905b6ed6 100644 --- a/test/dss/dss_payload.c +++ b/test/dss/dss_payload.c @@ -37,7 +37,7 @@ FILE *test_out; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/dss/dss_print.c b/test/dss/dss_print.c index 79221613a0..f021f61275 100644 --- a/test/dss/dss_print.c +++ b/test/dss/dss_print.c @@ -48,7 +48,7 @@ FILE *test_out; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/dss/dss_release.c b/test/dss/dss_release.c index abc8199cfd..7aedd25857 100644 --- a/test/dss/dss_release.c +++ b/test/dss/dss_release.c @@ -50,7 +50,7 @@ opal_dss_value_t dval = { {OBJ_CLASS(opal_dss_value_t),0},OPAL_UNDEF,NULL}; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/dss/dss_set_get.c b/test/dss/dss_set_get.c index 69b7f874c0..96b6cd1126 100644 --- a/test/dss/dss_set_get.c +++ b/test/dss/dss_set_get.c @@ -47,7 +47,7 @@ FILE *test_out; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/dss/dss_size.c b/test/dss/dss_size.c index baacdd578a..c128ec7b34 100644 --- a/test/dss/dss_size.c +++ b/test/dss/dss_size.c @@ -48,7 +48,7 @@ FILE *test_out; int main (int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_out = stderr; diff --git a/test/runtime/opal_init_finalize.c b/test/runtime/opal_init_finalize.c index 46ed188c83..f370896f1b 100644 --- a/test/runtime/opal_init_finalize.c +++ b/test/runtime/opal_init_finalize.c @@ -26,7 +26,7 @@ main(int argc, char *argv[]) { int ret; - ret = opal_init(); + ret = opal_init(&argc, &argv); if (OPAL_SUCCESS != ret) { return (-1 * ret); } diff --git a/test/util/opal_error.c b/test/util/opal_error.c index 37ef8e755d..5a954a233f 100644 --- a/test/util/opal_error.c +++ b/test/util/opal_error.c @@ -38,7 +38,7 @@ #include "opal/util/error.h" #include "opal/constants.h" #include "opal/runtime/opal.h" -#include "orte/orte_constants.h" +#include "orte/constants.h" int main(int argc, char *argv[]) @@ -53,7 +53,7 @@ main(int argc, char *argv[]) 1 }; /* sentinal */ char buf[1024]; - opal_init(); + opal_init(&argc, &argv); for (i = 0 ; errors[i] <= 0 ; ++i) { printf("--> error code: %d\n", errors[i]); diff --git a/test/util/opal_if.c b/test/util/opal_if.c index 80b65be37e..90fb0b8dea 100644 --- a/test/util/opal_if.c +++ b/test/util/opal_if.c @@ -61,7 +61,7 @@ main(int argc, char *argv[]) { char hostname[MAXHOSTNAMELEN]; - opal_init(); + opal_init(&argc, &argv); test_init("opal_if"); /* 127.0.0.1 */ diff --git a/test/util/opal_os_create_dirpath.c b/test/util/opal_os_create_dirpath.c index 02e700334c..b496e375eb 100644 --- a/test/util/opal_os_create_dirpath.c +++ b/test/util/opal_os_create_dirpath.c @@ -50,7 +50,7 @@ static bool test3(void); /* test making a directory tree */ int main(int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_init("opal_os_create_dirpath_t"); diff --git a/test/util/opal_os_path.c b/test/util/opal_os_path.c index 605624db41..ab96184af9 100644 --- a/test/util/opal_os_path.c +++ b/test/util/opal_os_path.c @@ -44,7 +44,7 @@ static bool test4(void); /* missing path separator test */ int main(int argc, char* argv[]) { - opal_init(); + opal_init(&argc, &argv); test_init("opal_os_path_t"); diff --git a/test/util/opal_timer.c b/test/util/opal_timer.c index ef565ba89d..b0620bd4f9 100644 --- a/test/util/opal_timer.c +++ b/test/util/opal_timer.c @@ -28,7 +28,7 @@ main(int argc, char *argv[]) { opal_timer_t start, end, diff; - opal_init(); + opal_init(&argc, &argv); printf("--> frequency: %llu\n", (unsigned long long) opal_timer_base_get_freq()); diff --git a/test/util/orte_session_dir.c b/test/util/orte_session_dir.c index e908ac3157..a994d7d815 100644 --- a/test/util/orte_session_dir.c +++ b/test/util/orte_session_dir.c @@ -30,8 +30,7 @@ #include #include "support.h" -#include "orte/orte_constants.h" -#include "orte/mca/ns/ns_types.h" +#include "orte/constants.h" #include "orte/util/proc_info.h" #include "opal/util/os_path.h" #include "orte/util/session_dir.h" diff --git a/test/util/orte_universe_setup_file_io.c b/test/util/orte_universe_setup_file_io.c index 7a95fcfd4d..a776f0bb82 100644 --- a/test/util/orte_universe_setup_file_io.c +++ b/test/util/orte_universe_setup_file_io.c @@ -17,7 +17,7 @@ */ #include "orte_config.h" -#include "orte/orte_constants.h" +#include "orte/constants.h" #include #include