From dd0a8a14f53b7053bcfa107fda1209bc54fd4332 Mon Sep 17 00:00:00 2001
From: Corey Swenson <cswenson@us.ibm.com>
Date: Fri, 8 Jul 2016 11:46:04 -0500
Subject: Enable HBRT targeting tests

Change-Id: I3aea0d203548809401b83fb853e4aeeb86095f22
RTC:153123
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26794
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/usr/targeting/runtime/attrPlatOverride_rt.C |  8 ++------
 src/usr/targeting/runtime/makefile              |  4 +---
 src/usr/targeting/runtime/test/testtargeting.H  | 13 +++++++------
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/usr/targeting/runtime')

diff --git a/src/usr/targeting/runtime/attrPlatOverride_rt.C b/src/usr/targeting/runtime/attrPlatOverride_rt.C
index 537e36464..2c28edec8 100644
--- a/src/usr/targeting/runtime/attrPlatOverride_rt.C
+++ b/src/usr/targeting/runtime/attrPlatOverride_rt.C
@@ -27,8 +27,7 @@
 #include <runtime/rt_targeting.H>
 #include <targeting/common/commontargeting.H>
 #include <targeting/attrPlatOverride.H>
-//@TODO RTC:132750
-//#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
+#include <fapi2/plat_attr_override_sync.H>
 #include <targeting/common/trace.H>
 #include <errl/errlmanager.H>
 #include <initservice/initserviceif.H>
@@ -42,8 +41,6 @@ int apply_attr_override(uint8_t* i_data,
                         size_t i_size )
 {
     int rc = 0;
-//@TODO RTC:132750
-#if 0
     errlHndl_t l_errl = NULL;
 
     TRACFCOMP(g_trac_targeting, "enter apply_attr_override");
@@ -52,7 +49,7 @@ int apply_attr_override(uint8_t* i_data,
     // expected to be empty. The passed overrides are added, not updated
     // in place.
     AttributeTank * l_pAttributeTank =
-                    &fapi::theAttrOverrideSync().iv_overrideTank;
+                    &fapi2::theAttrOverrideSync().iv_overrideTank;
     if ((*l_pAttributeTank).attributesExist())
     {
         TRACFCOMP(g_trac_targeting, "apply_attr_override:"
@@ -87,7 +84,6 @@ int apply_attr_override(uint8_t* i_data,
     {
         TRACFCOMP(g_trac_targeting, "apply_attr_override succeed");
     }
-#endif
     return rc;
 }
 
diff --git a/src/usr/targeting/runtime/makefile b/src/usr/targeting/runtime/makefile
index bcb741a66..7d311a030 100644
--- a/src/usr/targeting/runtime/makefile
+++ b/src/usr/targeting/runtime/makefile
@@ -25,8 +25,7 @@
 HOSTBOOT_RUNTIME = 1
 MODULE = targeting_rt
 
-#@TODO RTC:132750
-#SUBDIRS += test.d
+SUBDIRS += test.d
 
 TARGETING_REL_PATH = ..
 include ${TARGETING_REL_PATH}/hostboot_common.mk
@@ -39,7 +38,6 @@ HOSTBOOT_RUNTIME_SPECIFIC_OBJS += start_rt.o
 HOSTBOOT_RUNTIME_SPECIFIC_OBJS += targplatutil.o
 HOSTBOOT_RUNTIME_SPECIFIC_OBJS += rt_targeting.o
 HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attrPlatOverride_rt.o
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
 
 OBJS += ${COMMON_TARGETING_OBJS}
 OBJS += ${HOSTBOOT_RT_IPL_COMMON_OBJS}
diff --git a/src/usr/targeting/runtime/test/testtargeting.H b/src/usr/targeting/runtime/test/testtargeting.H
index d5dae303a..68ef93603 100644
--- a/src/usr/targeting/runtime/test/testtargeting.H
+++ b/src/usr/targeting/runtime/test/testtargeting.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,7 +31,6 @@
 #include <targeting/common/trace.H>
 #include <targeting/common/utilFilter.H>
 #include <targeting/attrPlatOverride.H>
-#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
 
 class TargetingTestSuite : public CxxTest::TestSuite
 {
@@ -76,7 +75,7 @@ class TargetingTestSuite : public CxxTest::TestSuite
                               targetList.end());
 
             targetList.clear();
-            getAllChiplets(targetList, TYPE_EX);
+            getAllChiplets(targetList, TYPE_CORE);
 
             allTargets.insert(allTargets.end(),
                               targetList.begin(),
@@ -109,11 +108,13 @@ class TargetingTestSuite : public CxxTest::TestSuite
 
                 if(*pTarg != target)
                 {
-                    TS_FAIL("testHBRT_targets failed for rt_chipID %x"
-                            "target_in %p, target_out %p",
+                    TS_FAIL("testHBRT_targets failed for rt_chipID %x "
+                            "target_in %p, huid %x, target_out %p, huid %x",
                             rt_chipid,
                             *pTarg,
-                            target);
+                            get_huid(*pTarg),
+                            target,
+                            get_huid(target));
                 }
             }
         }
-- 
cgit v1.2.1