summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Geddes <crgeddes@us.ibm.com>2019-04-17 10:13:54 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2019-04-19 10:16:13 -0500
commit8112a619ebf4861f3f85226de3e8dfd79cc43a5f (patch)
tree8392c1c5133fa83fdacaa785a4e23d4ada976bab
parentf8a7a5a564ec6a552b784eba7a0dd3615f65268c (diff)
downloadtalos-hostboot-8112a619ebf4861f3f85226de3e8dfd79cc43a5f.zip
talos-hostboot-8112a619ebf4861f3f85226de3e8dfd79cc43a5f.tar.gz
Run Axone simics all the way to completion by default
Prior to this commit we ended the IPL at istep 14.7 and ran the CXX test suite before shutting down. This commit will allow us to run through istep 21 like a standard IPL. Change-Id: Ifb567dc30e7ecbb31ed59889ff900411633844bf Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76098 Reviewed-by: Matthew Raybuck <matthew.raybuck@ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-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 HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r--src/build/configs/simics_axone.config5
-rw-r--r--src/makefile2
-rw-r--r--src/usr/runtime/test/makefile2
-rw-r--r--src/usr/xscom/test/xscomtest.H2
4 files changed, 5 insertions, 6 deletions
diff --git a/src/build/configs/simics_axone.config b/src/build/configs/simics_axone.config
index 99e3900..3d044ed 100644
--- a/src/build/configs/simics_axone.config
+++ b/src/build/configs/simics_axone.config
@@ -17,6 +17,8 @@ unset MEMVPD_WRITE_TO_HW
set MVPD_READ_FROM_PNOR
set MVPD_WRITE_TO_PNOR
+#set to run cxx testcases during boot
+unset EARLY_TESTCASES
#skip enabling checkstop analysis until OCC is ready in simics
unset IPLTIME_CHECKSTOP_ANALYSIS
@@ -24,9 +26,6 @@ unset IPLTIME_CHECKSTOP_ANALYSIS
#enable EEPROM caching
set SUPPORT_EEPROM_CACHING
-#run cxx testcases during boot
-set EARLY_TESTCASES
-
#Try to keep a list of things this does
# - skipping setting voltages in istep 8.12, nothing on other side of AVSbus
# in simics currently.
diff --git a/src/makefile b/src/makefile
index c354622..8dc48b9 100644
--- a/src/makefile
+++ b/src/makefile
@@ -244,7 +244,7 @@ TESTCASE_MODULES += $(if $(CONFIG_VPO_COMPILE),,testmdia)
TESTCASE_MODULES += testpirformat
TESTCASE_MODULES += testi2c
TESTCASE_MODULES += testmbox
-TESTCASE_MODULES += $(if $(CONFIG_EARLY_TESTCASES),,testrtloader)
+TESTCASE_MODULES += $(if $(or $(CONFIG_EARLY_TESTCASES),${CONFIG_AXONE_BRING_UP}) ,,testrtloader)
TESTCASE_MODULES += testsbe
TESTCASE_MODULES += testsbeio
TESTCASE_MODULES += testerrl
diff --git a/src/usr/runtime/test/makefile b/src/usr/runtime/test/makefile
index a5fec04..ec31624 100644
--- 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 $(CONFIG_EARLY_TESTCASES),,testpreverifiedlidmgr.H)
+TESTS += $(if $(or $(CONFIG_EARLY_TESTCASES),${CONFIG_AXONE_BRING_UP}) ,,testpreverifiedlidmgr.H)
TESTS += test_checkHbResMemLimit.H
#@TODO RTC 132750
#TESTS += hdatservicetest.H
diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H
index 2bb30ac..a3d7076 100644
--- a/src/usr/xscom/test/xscomtest.H
+++ b/src/usr/xscom/test/xscomtest.H
@@ -404,7 +404,7 @@ public:
uint32_t l_num;
do {
-#ifdef CONFIG_EARLY_TESTCASES
+#if defined(CONFIG_EARLY_TESTCASES) || defined(CONFIG_AXONE_BRING_UP)
TS_TRACE("testXscom4: Skipping test, multicast groups not setup yet");
break;
#endif
OpenPOWER on IntegriCloud