aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorVasant Hegde <hegdevasant@linux.vnet.ibm.com>2019-10-21 18:14:16 +0530
committerOliver O'Halloran <oohall@gmail.com>2019-10-22 17:32:04 +1100
commit49be337732cabec859acbf2f39ad191a43cace4a (patch)
tree633091138c9eff62dedcfccca06f6874215b1f3e /external
parenta0c996e432bce3e8f2fd49c3064fbb5bf72b4022 (diff)
downloadskiboot-49be337732cabec859acbf2f39ad191a43cace4a.zip
skiboot-49be337732cabec859acbf2f39ad191a43cace4a.tar.gz
skiboot-49be337732cabec859acbf2f39ad191a43cace4a.tar.bz2
gard: Add support to run gard tests on FSP platform
gard tool is not supported on FSP based system. But we can still run gard tests on FSP based system. Acked-by: Stewart Smith <stewart@flamingspork.com> Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'external')
-rw-r--r--external/gard/gard.c12
-rw-r--r--external/gard/test/tests/02-usage5
2 files changed, 11 insertions, 6 deletions
diff --git a/external/gard/gard.c b/external/gard/gard.c
index 6f75932..5e58fed 100644
--- a/external/gard/gard.c
+++ b/external/gard/gard.c
@@ -821,12 +821,6 @@ int main(int argc, char **argv)
memset(ctx, 0, sizeof(*ctx));
memset(&blank_record, 0xff, sizeof(blank_record));
- if (is_fsp()) {
- fprintf(stderr, "This is the OpenPower gard tool which does "
- "not support FSP systems\n");
- return EXIT_FAILURE;
- }
-
/* process global options */
for (;;) {
int c;
@@ -866,6 +860,12 @@ int main(int argc, char **argv)
}
+ if (is_fsp() && !filename) {
+ fprintf(stderr, "This is the OpenPower gard tool which does "
+ "not support FSP systems\n");
+ return EXIT_FAILURE;
+ }
+
/*
* It doesn't make sense to specify that we have the gard partition but
diff --git a/external/gard/test/tests/02-usage b/external/gard/test/tests/02-usage
index 290cca1..7ef3c04 100644
--- a/external/gard/test/tests/02-usage
+++ b/external/gard/test/tests/02-usage
@@ -1,5 +1,10 @@
#! /bin/sh
+# This test fails on FSP based system. Hence skip this test.
+if [ -d "/proc/device-tree/fsps" ] ; then
+ return 0
+fi
+
run_binary "./opal-gard"
if [ "$?" -ne 1 ] ; then
fail_test