diff options
Diffstat (limited to 'src/usr/expaccess/test')
-rw-r--r-- | src/usr/expaccess/test/expscomtest.H | 18 | ||||
-rw-r--r-- | src/usr/expaccess/test/exptest_utils.C | 23 | ||||
-rw-r--r-- | src/usr/expaccess/test/exptest_utils.H | 11 | ||||
-rw-r--r-- | src/usr/expaccess/test/ocmbcommtest.H | 18 |
4 files changed, 5 insertions, 65 deletions
diff --git a/src/usr/expaccess/test/expscomtest.H b/src/usr/expaccess/test/expscomtest.H index 9e9a750f8..6da7d53b1 100644 --- a/src/usr/expaccess/test/expscomtest.H +++ b/src/usr/expaccess/test/expscomtest.H @@ -109,9 +109,7 @@ private: return fapi2::getScom(i_target,i_address,o_data); } - // use this to keep track of if we need to unload any - // modules loaded by this testcase - bool mss_module_loaded; + // This is used for tests that need to not run operations at the same time HB_MUTEX_SERIALIZE_TEST_LOCK_ATTR iv_serializeTestMutex; public: @@ -807,14 +805,12 @@ public: */ expscomTest() : CxxTest::TestSuite() { - 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 = exptest::loadModule(mss_module_loaded, exptest::MSS_LIBRARY_NAME); + err = exptest::loadModule(exptest::MSS_LIBRARY_NAME); if(err) { TS_FAIL("expscomTest() - Constuctor: failed to load MSS module"); @@ -830,16 +826,6 @@ public: */ ~expscomTest() { - errlHndl_t err = nullptr; - if (mss_module_loaded) - { - err = exptest::unloadModule(exptest::MSS_LIBRARY_NAME); - if(err) - { - TS_FAIL("~expscomTest() - Destructor: failed to unload MSS module"); - errlCommit( err, CXXTEST_COMP_ID ); - } - } }; }; diff --git a/src/usr/expaccess/test/exptest_utils.C b/src/usr/expaccess/test/exptest_utils.C index 5209a318d..46421fc4a 100644 --- a/src/usr/expaccess/test/exptest_utils.C +++ b/src/usr/expaccess/test/exptest_utils.C @@ -28,10 +28,9 @@ namespace exptest { - errlHndl_t loadModule(bool & o_module_loaded, const char * i_modName) + errlHndl_t loadModule(const char * i_modName) { errlHndl_t err = NULL; - o_module_loaded = false; // VFS functions only compilable in non-runtime environment #ifndef __HOSTBOOT_RUNTIME @@ -44,7 +43,6 @@ namespace exptest } else { - o_module_loaded = true; FAPI_INF("loadModule: %s loaded", i_modName); } } @@ -52,25 +50,6 @@ namespace exptest return err; } - errlHndl_t unloadModule(const char * i_modName) - { - errlHndl_t err = NULL; - - // VFS function only compilable in non-runtime environment - #ifndef __HOSTBOOT_RUNTIME - err = VFS::module_unload(i_modName); - if(err) - { - TS_FAIL("unloadModule() - %s unload failed", i_modName ); - } - else - { - FAPI_INF("unloadModule: %s unloaded", i_modName); - } - #endif - return err; - } - TARGETING::HB_MUTEX_SERIALIZE_TEST_LOCK_ATTR getTestMutex(void) { TARGETING::HB_MUTEX_SERIALIZE_TEST_LOCK_ATTR pMutex = nullptr; diff --git a/src/usr/expaccess/test/exptest_utils.H b/src/usr/expaccess/test/exptest_utils.H index ce0f5fe0d..a62b4de71 100644 --- a/src/usr/expaccess/test/exptest_utils.H +++ b/src/usr/expaccess/test/exptest_utils.H @@ -37,19 +37,10 @@ const char MSS_LIBRARY_NAME[17] = "libisteps_mss.so"; /** * @brief Generic function to load a module - * @param o_module_loaded - returns true if module is loaded by this function * @param i_modName - module name to load * @return error handle if module_load call fails */ -errlHndl_t loadModule(bool & o_module_loaded, const char * i_modName); - -/** - * @brief Generic function to unload a module - * @param i_modName - module name to load - * @return error handle if module_unload call fails - * - */ -errlHndl_t unloadModule(const char * i_modName); +errlHndl_t loadModule(const char * i_modName); /** * @brief Get the mutex pointer for syncronizing tests diff --git a/src/usr/expaccess/test/ocmbcommtest.H b/src/usr/expaccess/test/ocmbcommtest.H index 8c75db298..b804ecb1b 100644 --- a/src/usr/expaccess/test/ocmbcommtest.H +++ b/src/usr/expaccess/test/ocmbcommtest.H @@ -232,14 +232,12 @@ class OCMBCommTest: public CxxTest::TestSuite */ OCMBCommTest() : CxxTest::TestSuite() { - 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 = exptest::loadModule(mss_module_loaded, exptest::MSS_LIBRARY_NAME); + err = exptest::loadModule(exptest::MSS_LIBRARY_NAME); if(err) { TS_FAIL("OCMBCommTest() - Constuctor: failed to load MSS module"); @@ -254,23 +252,9 @@ class OCMBCommTest: public CxxTest::TestSuite */ ~OCMBCommTest() { - errlHndl_t err = nullptr; - if (mss_module_loaded) - { - err = exptest::unloadModule(exptest::MSS_LIBRARY_NAME); - if(err) - { - TS_FAIL("~OCMBCommTest() - Destructor: failed to unload MSS module"); - errlCommit( err, TARG_COMP_ID ); - } - } }; private: - // use this to keep track of if we need to unload any - // modules loaded by this testcase - bool mss_module_loaded; - // This is used for tests that need to not run operations at the same time TARGETING::HB_MUTEX_SERIALIZE_TEST_LOCK_ATTR iv_serializeTestMutex; |