From c203e020f547396dc8632686773141f6d3957d2e Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 23 Jul 2015 06:18:43 -0700
Subject: [PATCH] orte/test/system: fix compiler warnings

Note that the opal_hotel test still doesn't compile; it looks like it
needs to be updated to the new requirement to pass an event base.

(cherry picked from commit open-mpi/ompi@60609cbb79a99d6a8ed946e07f699135aa0a2a8d)
---
 orte/test/system/binom.c           | 2 +-
 orte/test/system/mapper.c          | 1 +
 orte/test/system/opal-evpri-test.c | 4 ++--
 orte/test/system/opal_interface.c  | 2 +-
 orte/test/system/radix.c           | 2 +-
 orte/test/system/regex.c           | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/orte/test/system/binom.c b/orte/test/system/binom.c
index 486d0563a1..e807a33ad2 100644
--- a/orte/test/system/binom.c
+++ b/orte/test/system/binom.c
@@ -30,7 +30,7 @@ static void construct(orte_routed_tree_t *rt)
     rt->vpid = ORTE_VPID_INVALID;
     OBJ_CONSTRUCT(&rt->relatives, opal_bitmap_t);
 }
-static destruct(orte_routed_tree_t *rt)
+static void destruct(orte_routed_tree_t *rt)
 {
     OBJ_DESTRUCT(&rt->relatives);
 }
diff --git a/orte/test/system/mapper.c b/orte/test/system/mapper.c
index f43422c16d..ae92075649 100644
--- a/orte/test/system/mapper.c
+++ b/orte/test/system/mapper.c
@@ -2,6 +2,7 @@
  */
 
 #include <stdio.h>
+#include <ctype.h>
 
 #include "orte/constants.h"
 
diff --git a/orte/test/system/opal-evpri-test.c b/orte/test/system/opal-evpri-test.c
index 70fd2313de..20dfce741f 100644
--- a/orte/test/system/opal-evpri-test.c
+++ b/orte/test/system/opal-evpri-test.c
@@ -3,8 +3,8 @@
 #include <signal.h>
 #include <stdbool.h>
 
+#include "opal/runtime/opal.h"
 #include "opal/mca/event/event.h"
-
 #include "orte/mca/state/state_types.h"
 
 #define SIGPRI 0
@@ -62,7 +62,7 @@ main(int argc, char **argv)
     opal_event_t ev1, ev2;
     orte_state_caddy_t *caddy;
 
-    opal_init();
+    opal_init(&argc, &argv);
 
     /* assign some signal traps */
     if (opal_event_signal_set(orte_event_base, &ev1, SIGTERM, cbfunc, &ev1) < 0) {
diff --git a/orte/test/system/opal_interface.c b/orte/test/system/opal_interface.c
index 27f6758117..df76264c46 100644
--- a/orte/test/system/opal_interface.c
+++ b/orte/test/system/opal_interface.c
@@ -29,7 +29,7 @@ int main(int argc, char* argv[])
     
     if (OPAL_SUCCESS != mca_base_framework_open(&opal_if_base_framework, 0)) {
         fprintf(stderr, "opal_interface: couldn't get interfaces\n");
-        return;
+        return 1;
     }
 
     for (intf =  (opal_if_t*)opal_list_get_first(&opal_if_list);
diff --git a/orte/test/system/radix.c b/orte/test/system/radix.c
index 68a2d22b7c..a0a9c03dd9 100644
--- a/orte/test/system/radix.c
+++ b/orte/test/system/radix.c
@@ -70,7 +70,7 @@ int down_search(int me, int num_procs,
     }
 }
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
     opal_list_t children;
     opal_list_item_t *item;
diff --git a/orte/test/system/regex.c b/orte/test/system/regex.c
index cc0805d8f3..6985fcb7bb 100644
--- a/orte/test/system/regex.c
+++ b/orte/test/system/regex.c
@@ -15,7 +15,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/runtime/runtime.h"
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
     int rc;
     char *regex, *save;