Modify PLL test case to get plugin from RAS data files
Instead of inputing the exact plugin name for test. Force the test case
to query the RAS data files for the appropriate plugin name.
Change-Id: I589f33869e6894499c5b03f7bb4f67034bfe7a67
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
diff --git a/test/meson.build b/test/meson.build
index 0fa9c9e..87449a7 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -20,6 +20,8 @@
endif
endif
+################################################################################
+
# NOTE: We cannot link to `util_lib` because that is built without
# `-DTEST_TRACE` and any of the util functions that use `trace.hpp` will
# throw a linker error because we don't have access to phosphor-logging
@@ -27,6 +29,7 @@
test_arg = [
'-DTEST_TRACE',
+ package_args,
]
# Compile the test dts into a binary for pdbg.
@@ -134,7 +137,10 @@
files(
tc + '.cpp',
'../analyzer/plugins/p10-plugins.cpp',
+ '../analyzer/ras-data/ras-data-parser.cpp',
+ '../analyzer/resolution.cpp',
'../analyzer/service_data.cpp',
+ '../util/data_file.cpp',
'../util/pdbg.cpp',
'pdbg-sim-only.cpp',
),
diff --git a/test/test-pll-unlock.cpp b/test/test-pll-unlock.cpp
index c09bf90..3ac44d1 100644
--- a/test/test-pll-unlock.cpp
+++ b/test/test-pll-unlock.cpp
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <analyzer/plugins/plugin.hpp>
+#include <analyzer/ras-data/ras-data-parser.hpp>
#include <hei_util.hpp>
#include <util/pdbg.hpp>
#include <util/trace.hpp>
@@ -21,14 +22,12 @@
libhei::Signature sig11{chip1, nodeId, 0, 1, libhei::ATTN_TYPE_CHECKSTOP};
- auto plugin = PluginMap::getSingleton().get(chip1.getType(), "pll_unlock");
-
libhei::IsolationData isoData{};
isoData.addSignature(sig11);
ServiceData sd{sig11, AnalysisType::SYSTEM_CHECKSTOP, isoData};
- // Call the PLL unlock plugin.
- plugin(1, chip1, sd);
+ RasDataParser rasData{};
+ rasData.getResolution(sig11)->resolve(sd);
nlohmann::json j{};
std::string s{};