Enable testpreverifiedlidmgr for Axone

Since cxxtests only run in standalone, need to skip PNOR::VERSION section whether in secure mode or not. Change-Id: I951e74ff3638490bfe06d0a0cf4283fedac78136 RTC:201738 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81345 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: Roland Veloz <rveloz@us.ibm.com> Reviewed-by: Corey V Swenson <cswenson@us.ibm.com> Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
open-power · Aug 1, 2019 · b3043ae · b3043ae
1 parent eafe3e3
commit b3043ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/usr/runtime/test/makefile b/src/usr/runtime/test/makefile
@@ -24,7 +24,7 @@
 # IBM_PROLOG_END_TAG
 ROOTPATH = ../../../..
 MODULE = testruntime
-TESTS += $(if $(or $(CONFIG_EARLY_TESTCASES),${CONFIG_AXONE_BRING_UP}) ,,testpreverifiedlidmgr.H)
+TESTS += $(if $(CONFIG_EARLY_TESTCASES) ,,testpreverifiedlidmgr.H)
 TESTS += test_checkHbResMemLimit.H
 #@TODO RTC 132750
 #TESTS += hdatservicetest.H

diff --git a/src/usr/runtime/test/testpreverifiedlidmgr.H b/src/usr/runtime/test/testpreverifiedlidmgr.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2017                             */
+/* Contributors Listed Below - COPYRIGHT 2017,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -118,12 +118,12 @@ class PreVerifiedLidMgrTest : public CxxTest::TestSuite
             // RINGOVD not permitted in secure mode. Meaning the Header and
             // Content lid will be missing.
             l_expectedLids -= 2;
-
-            // VERSION is only an OpenPOWER partition so we need to adjust for
-            // it here since it doesn't exist for standalone.
-            l_expectedLids -= 2;
         }
 
+        // VERSION is only an OpenPOWER partition so we need to adjust for
+        // it here since it doesn't exist for standalone.
+        l_expectedLids -= 2;
+
         // Ensure the expected number of lids were loaded.
         if (l_preVerLidMgr.cv_lidsLoaded.size() != l_expectedLids)
         {