Enable mbox test cases

Change-Id: I22f80858539438871d33b06be505854149d267a0
RTC: 179069
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46699
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 61 insertions, 60 deletions

diff --git a/src/usr/mbox/test/mboxsptest.H b/src/usr/mbox/test/mboxsptest.H
index e0058d8e6..8a6a11f14 100644
--- a/src/usr/mbox/test/mboxsptest.H
+++ b/src/usr/mbox/test/mboxsptest.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -144,8 +144,8 @@ class MboxSPTest : public CxxTest::TestSuite
 
                   ++msg_idx;
 
-                  if(msg->type != 1 || 
-                     msg->data[0] != msg_idx || 
+                  if(msg->type != 1 ||
+                     msg->data[0] != msg_idx ||
                      msg->data[1] != 33 * 1024)
                   {
                       TS_FAIL("MBOXTEST: Unexpected message from FSP");
@@ -228,7 +228,7 @@ class MboxSPTest : public CxxTest::TestSuite
 
           msg->type = 2;
           msg->data[1] = 128 * 1024;  // too big of message
-          msg->extra_data = malloc(8);  
+          msg->extra_data = malloc(8);
           err = MBOX::sendrecv(MBOX::FSP_ECHO_MSGQ,msg);
 
           if(!err)
@@ -332,63 +332,64 @@ class MboxSPTest : public CxxTest::TestSuite
 
       /**
        * @brief IPC message test
-       * 
+       *
        */
-      void testIPC(void)
-      {
-          TRACFCOMP(g_trac_mbox,"testIPC>");
-          errlHndl_t err = NULL;
-          msg_t * msg = msg_allocate();
-          msg_t * tmsg = msg_allocate();
-          msg_q_t msgQ = msg_q_create();
-
-          err = MBOX::msgq_register(MBOX::HB_TEST_MSGQ,msgQ);
-          if(err)
-          {
-              TS_FAIL("MBOX IPC: Could not register message queue");
-              errlCommit(err,MBOX_COMP_ID);
-          }
-
-          msg->type = 1;
-          msg->data[0] = 0x1111111111111111ull;
-          msg->data[1] = 0x4444444444444444ull;
-          msg->extra_data = (void *)0x3333333333333333ull;
-
-          *tmsg = *msg; // save for compare
-          uint64_t node = 0;
-
-          err = MBOX::send(MBOX::HB_TEST_MSGQ,msg,node);
-          if(err)
-          {
-              TS_FAIL("MBOX::send (IPC) returned and error log");
-              errlCommit(err,MBOX_COMP_ID);
-              msg_free(msg);
-              return;
-          }
-
-          msg_t * rmsg = msg_wait(msgQ);
-
-          if(rmsg->type != tmsg->type || 
-             rmsg->data[0] != tmsg->data[0] || 
-             rmsg->data[1] != tmsg->data[1] ||
-             rmsg->extra_data != tmsg->extra_data)
-          {
-              TS_FAIL("IPCTEST: Unexpected IPC message");
-
-              TRACFCOMP(g_trac_mbox,
-                        "IPCTEST IPC MSG: %d %lx %lx %p",
-                        rmsg->type,
-                        rmsg->data[0],
-                        rmsg->data[1],
-                        rmsg->extra_data);
-          }
-
-          msgQ = MBOX::msgq_unregister(MBOX::HB_TEST_MSGQ);
-          msg_q_destroy(msgQ);
-          msg_free(rmsg);
-          msg_free(tmsg);
-          TRACFCOMP(g_trac_mbox,"<testIPC");
-      }
+// TODO: RTC:150861 re-enable test when IPC is available
+//       void testIPC(void)
+//       {
+//           TRACFCOMP(g_trac_mbox,"testIPC>");
+//           errlHndl_t err = NULL;
+//           msg_t * msg = msg_allocate();
+//           msg_t * tmsg = msg_allocate();
+//           msg_q_t msgQ = msg_q_create();
+//
+//           err = MBOX::msgq_register(MBOX::HB_TEST_MSGQ,msgQ);
+//           if(err)
+//           {
+//               TS_FAIL("MBOX IPC: Could not register message queue");
+//               errlCommit(err,MBOX_COMP_ID);
+//           }
+//
+//           msg->type = 1;
+//           msg->data[0] = 0x1111111111111111ull;
+//           msg->data[1] = 0x4444444444444444ull;
+//           msg->extra_data = (void *)0x3333333333333333ull;
+//
+//           *tmsg = *msg; // save for compare
+//           uint64_t node = 0;
+//
+//           err = MBOX::send(MBOX::HB_TEST_MSGQ,msg,node);
+//           if(err)
+//           {
+//               TS_FAIL("MBOX::send (IPC) returned and error log");
+//               errlCommit(err,MBOX_COMP_ID);
+//               msg_free(msg);
+//               return;
+//           }
+//
+//           msg_t * rmsg = msg_wait(msgQ);
+//
+//           if(rmsg->type != tmsg->type ||
+//              rmsg->data[0] != tmsg->data[0] ||
+//              rmsg->data[1] != tmsg->data[1] ||
+//              rmsg->extra_data != tmsg->extra_data)
+//           {
+//               TS_FAIL("IPCTEST: Unexpected IPC message");
+//
+//               TRACFCOMP(g_trac_mbox,
+//                         "IPCTEST IPC MSG: %d %lx %lx %p",
+//                         rmsg->type,
+//                         rmsg->data[0],
+//                         rmsg->data[1],
+//                         rmsg->extra_data);
+//           }
+//
+//           msgQ = MBOX::msgq_unregister(MBOX::HB_TEST_MSGQ);
+//           msg_q_destroy(msgQ);
+//           msg_free(rmsg);
+//           msg_free(tmsg);
+//           TRACFCOMP(g_trac_mbox,"<testIPC");
+//       }
 };
 
 #endif