* Update to make this work again with the changes in the mca changes

This commit was SVN r657.

test/unit/lam/oob_cofs/Makefile.am

@@ -10,10 +10,10 @@ noinst_PROGRAMS		= oob_cofs_test pcm_cofs_test
 oob_cofs_test_SOURCES 	= oob_cofs_test.c
 oob_cofs_test_LDADD	= \
 			../../../../src/mca/lam/oob/cofs/libmca_lam_oob_cofs.la \
-			../../../../src/lam/liblam.la
+			../../../../src/liblam.la
 
 pcm_cofs_test_SOURCES 	= pcm_cofs_test.c
 pcm_cofs_test_LDADD	= \
 			../../../../src/mca/lam/pcm/cofs/libmca_lam_pcm_cofs.la \
 			../../../../src/mca/lam/oob/cofs/libmca_lam_oob_cofs.la \
-			../../../../src/lam/liblam.la
+			../../../../src/liblam.la

test/unit/lam/oob_cofs/oob_cofs_test.c

@@ -10,13 +10,16 @@ main(int argc, char* argv[])
 {
   int ret;
   char *tmp;
-  int priority = 0;
   struct mca_oob_1_0_0_t *init_ret;
   int target_vpid, source_vpid, source_tag;
   size_t source_len;
   char *source_data;
   char buffer[2048];
   int msg_count = 0;
+  int priority = 0;
+  bool allow_threads = false;
+  bool have_hidden_threads = false;
+
 
   if (argc != 3) {
     printf("usage: %s my_vpid target_vpid\n", argv[0]);
@@ -29,24 +32,18 @@ main(int argc, char* argv[])
 
   target_vpid = atoi(argv[2]);
   
-  ret = mca_oob_cofs_open(NULL);
+  ret = mca_oob_cofs_open();
   if (ret != LAM_SUCCESS) {
     printf("mca_oob_cofs_open returned %d\n", ret);
     exit(1);
   }
 
-  ret = mca_oob_cofs_query(&priority);
+  init_ret = mca_oob_cofs_init(&priority, &allow_threads, &have_hidden_threads);
-  if (ret != LAM_SUCCESS) {
-    printf("mca_oob_cofs_query returned %d\n", ret);
-    exit(1);
-  } else {
-    printf("mca_oob_cofs_query said \"go\" with priority %d\n", priority);
-  }
-
-  init_ret = mca_oob_cofs_init();
   if (init_ret == NULL) {
     printf("mca_oob_cofs_init returned NULL\n");
     exit(1);
+  } else {
+    printf("mca_oob_cofs_query said \"go\" with priority %d\n", priority);
   }
 
   printf("#\n# Sending Messages\n#\n\n");

test/unit/lam/oob_cofs/pcm_cofs_test.c

@@ -15,23 +15,15 @@ int
 main(int argc, char *argv[])
 {
   int ret;
-  int dummy;
   struct mca_pcm_1_0_0_t* modret;
   mca_pcm_proc_t *procs;
   size_t nprocs;
   mca_pcm_proc_t *my_proc;
-  size_t i;
+  int priority = 0;
+  bool allow_threads = false;
+  bool have_hidden_threads = false;
 
-  /*
+  modret = mca_pcm_cofs_init(&priority, &allow_threads, &have_hidden_threads);
-   * Do stuff that would normally be hidden in the mca interface code
-   */
-  ret = mca_pcm_cofs_query(&dummy);
-  if (ret != MPI_SUCCESS) {
-    printf("Failed to query PCM module.  Aborting.\n");
-    exit(1);
-  }
-
-  modret = mca_pcm_cofs_init();
   if (modret == NULL) {
     printf("failed to init PCM module.  Aborting.\n");
     exit(1);