Skip to content

Commit

Permalink
Fix issues with how we were handling new .so added for Axone
Browse files Browse the repository at this point in the history
This commit addresses two problems, one is that we were loading and
unloading expaccess.so in the ocmbcomm tests when it is included
in the extended image. Also we had mmio.so listed as a DEP lib in
istep 12, this caused it to get unloaded after that step. This .so
is also part of the extended image. To remove compile errors I added
these new .so's to the listdeps.pl script.

Change-Id: I83292a53e0021c05468605e62f9b00cefc2af268
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/73182
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
crgeddes authored and dcrowell77 committed Mar 13, 2019
1 parent 63afd50 commit 5618f2f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 28 deletions.
2 changes: 2 additions & 0 deletions src/build/tools/listdeps.pl
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@
"libscom.so" => '1',
"libxscom.so" => '1',
"libnode_comm.so" => '1',
"libmmio.so" => '1',
"libexpaccess.so" => '1',
};

# A list of the dependent libraries in each istep.
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/isteps/istep12list.H
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand Down Expand Up @@ -290,7 +290,6 @@ const DepModInfo g_istep12Dependancies = {
DEP_LIB(libnestmemutils.so),
DEP_LIB(libisteps_io.so),
DEP_LIB(libisteps_mss.so),
DEP_LIB(libmmio.so),
NULL
}
};
Expand Down
30 changes: 4 additions & 26 deletions src/usr/expaccess/test/ocmbcommtest.H
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ typedef struct
} FW_ADAPTER_PROPERTIES_type;


// Testing this code
const char EXPLORER_LIBRARY_NAME[16] = "libexpaccess.so";

// Need this module for mss::c_str call in HWP failure path traces
const char MSS_LIBRARY_NAME[17] = "libisteps_mss.so";

Expand Down Expand Up @@ -271,28 +268,19 @@ class OCMBCommTest: public CxxTest::TestSuite
*/
OCMBCommTest() : CxxTest::TestSuite()
{
explorer_module_loaded = false;
mss_module_loaded = false;

// All modules are loaded by runtime,
// so testcase loading of modules is not required
#ifndef __HOSTBOOT_RUNTIME
errlHndl_t err = nullptr;
err = loadModule(explorer_module_loaded, EXPLORER_LIBRARY_NAME);

err = loadModule(mss_module_loaded, MSS_LIBRARY_NAME);
if(err)
{
TS_FAIL("OCMBCommTest() - Constuctor: failed to load EXPLORER module");
TS_FAIL("OCMBCommTest() - Constuctor: failed to load MSS module");
errlCommit( err, TARG_COMP_ID );
}
else
{
err = loadModule(mss_module_loaded, MSS_LIBRARY_NAME);
if(err)
{
TS_FAIL("OCMBCommTest() - Constuctor: failed to load MSS module");
errlCommit( err, TARG_COMP_ID );
}
}
#endif
};

Expand All @@ -303,15 +291,6 @@ class OCMBCommTest: public CxxTest::TestSuite
~OCMBCommTest()
{
errlHndl_t err = nullptr;
if (explorer_module_loaded)
{
err = unloadModule(EXPLORER_LIBRARY_NAME);
if(err)
{
TS_FAIL("~OCMBCommTest() - Destructor: failed to unload EXPLORER module");
errlCommit( err, TARG_COMP_ID );
}
}
if (mss_module_loaded)
{
err = unloadModule(MSS_LIBRARY_NAME);
Expand All @@ -324,9 +303,8 @@ class OCMBCommTest: public CxxTest::TestSuite
};

private:
// use these to keep track of if we need to unload any
// use this to keep track of if we need to unload any
// modules loaded by this testcase
bool explorer_module_loaded;
bool mss_module_loaded;

};
Expand Down

0 comments on commit 5618f2f

Please sign in to comment.