[Skiboot] [PATCH RFC] gard: Use consistent name

Vasant Hegde hegdevasant at linux.vnet.ibm.com
Sun May 12 21:34:01 AEST 2019 

During compilation we generates binary file as "gard" and during
installation we install it as "opal-gard". This seems to be
creating some confusion. Some people are thinking these are two
different tools. Hence lets use common name for gard tool
("opal-gard").

Cc: Oliver O'Halloran <oohall at gmail.com>
Cc: Andrew Jeffery <andrew at aj.id.au>
Signed-off-by: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
---
 external/gard/rules.mk                          | 2 +-
 external/gard/test/add_test.sh                  | 6 +++---
 external/gard/test/results/02-usage.err         | 2 +-
 external/gard/test/tests/00-list                | 2 +-
 external/gard/test/tests/01-show_1              | 2 +-
 external/gard/test/tests/02-usage               | 2 +-
 external/gard/test/tests/03-show_1-p9           | 2 +-
 external/gard/test/tests/04-create-bad-instance | 2 +-
 external/gard/test/tests/05-create-bad-unit     | 2 +-
 external/gard/test/tests/06-create-long-path    | 2 +-
 external/gard/test/tests/07-create-slash        | 2 +-
 external/gard/test/tests/08-create-duplicate    | 2 +-
 external/gard/test/tests/09-create-last-unit    | 4 ++--
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/external/gard/rules.mk b/external/gard/rules.mk
index 3af5d1a6a..522b16f89 100644
--- a/external/gard/rules.mk
+++ b/external/gard/rules.mk
@@ -10,7 +10,7 @@ CCAN_OBJS	:= $(addprefix ccan-list-, $(CCAN_FILES:.c=.o))
 CCAN_SRC	:= $(addprefix ccan/list/,$(CCAN_FILES))
 OBJS     += $(LIBFLASH_OBJS) $(CCAN_OBJS)
 OBJS     += common-arch_flash.o
-EXE       = gard
+EXE       = opal-gard
 
 prefix = /usr/local/
 sbindir = $(prefix)/sbin
diff --git a/external/gard/test/add_test.sh b/external/gard/test/add_test.sh
index 8e7736096..6523dffc6 100755
--- a/external/gard/test/add_test.sh
+++ b/external/gard/test/add_test.sh
@@ -2,7 +2,7 @@
 #
 # this is a really dumb script for auto-generating test cases from known good-data
 #
-# usage: ./add_test <pass|fail> <inputfile> <testname> [gard subcommand]
+# usage: ./add_test <pass|fail> <inputfile> <testname> [opal-gard subcommand]
 #
 # e.g.
 #      ./add_test.sh fail blank.bin create-bad-instance create /sys256
@@ -47,7 +47,7 @@ echo "making $num-$name: f=$script_file, normally $test_type, cmd='$*'"
 cat > $script_file <<EOF
 #! /bin/sh
 
-run_binary "./gard" "-9 -p -e -f $file $*"
+run_binary "./opal-gard" "-9 -p -e -f $file $*"
 $check
 	fail_test
 fi
@@ -63,5 +63,5 @@ stderr_file="test/results/$num-$name.err"
 
 test_input="$name-$num-input"
 cp $file $test_input
-./gard -f $test_input -p -e $* 2>$stderr_file >$stdout_file
+./opal-gard -f $test_input -p -e $* 2>$stderr_file >$stdout_file
 rm -f $test_input
diff --git a/external/gard/test/results/02-usage.err b/external/gard/test/results/02-usage.err
index 356625bd2..0e0782628 100644
--- a/external/gard/test/results/02-usage.err
+++ b/external/gard/test/results/02-usage.err
@@ -1,4 +1,4 @@
-Usage: ./gard [-a -e -f <file> -p] <command> [<args>]
+Usage: ./opal-gard [-a -e -f <file> -p] <command> [<args>]
 
 -8 --p8
 -9 --p9
diff --git a/external/gard/test/tests/00-list b/external/gard/test/tests/00-list
index aa38fc3cf..982acb3d3 100644
--- a/external/gard/test/tests/00-list
+++ b/external/gard/test/tests/00-list
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -8 -f test/files/data1.bin list"
+run_binary "./opal-gard" "-p -e -8 -f test/files/data1.bin list"
 if [ "$?" -ne 0 ] ; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/01-show_1 b/external/gard/test/tests/01-show_1
index dc67b93e0..48b779eb9 100644
--- a/external/gard/test/tests/01-show_1
+++ b/external/gard/test/tests/01-show_1
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -8 -f test/files/data1.bin show 1"
+run_binary "./opal-gard" "-p -e -8 -f test/files/data1.bin show 1"
 if [ "$?" -ne 0 ] ; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/02-usage b/external/gard/test/tests/02-usage
index 45e5e02ab..290cca130 100644
--- a/external/gard/test/tests/02-usage
+++ b/external/gard/test/tests/02-usage
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard"
+run_binary "./opal-gard"
 if [ "$?" -ne 1 ] ; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/03-show_1-p9 b/external/gard/test/tests/03-show_1-p9
index c9b06d158..2a7b91b7d 100644
--- a/external/gard/test/tests/03-show_1-p9
+++ b/external/gard/test/tests/03-show_1-p9
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -f test/files/data-p9.bin --p9 show 1"
+run_binary "./opal-gard" "-p -e -f test/files/data-p9.bin --p9 show 1"
 if [ "$?" -ne 0 ] ; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/04-create-bad-instance b/external/gard/test/tests/04-create-bad-instance
index 29e08bd16..f9070a3dc 100644
--- a/external/gard/test/tests/04-create-bad-instance
+++ b/external/gard/test/tests/04-create-bad-instance
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -8 -f test/files/blank.bin create /sys256"
+run_binary "./opal-gard" "-p -e -8 -f test/files/blank.bin create /sys256"
 if [ "$?" -eq 0 ]; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/05-create-bad-unit b/external/gard/test/tests/05-create-bad-unit
index cfe4b71e8..be60aed04 100644
--- a/external/gard/test/tests/05-create-bad-unit
+++ b/external/gard/test/tests/05-create-bad-unit
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -f test/files/blank.bin create /doesnt_exist0"
+run_binary "./opal-gard" "-p -e -f test/files/blank.bin create /doesnt_exist0"
 if [ "$?" -eq 0 ]; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/06-create-long-path b/external/gard/test/tests/06-create-long-path
index 7eb197b60..f3ffaabf6 100644
--- a/external/gard/test/tests/06-create-long-path
+++ b/external/gard/test/tests/06-create-long-path
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -8 -f test/files/blank.bin create /sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/"
+run_binary "./opal-gard" "-p -e -8 -f test/files/blank.bin create /sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/sys0/"
 if [ "$?" -eq 0 ]; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/07-create-slash b/external/gard/test/tests/07-create-slash
index 3897a7b55..0e597e346 100644
--- a/external/gard/test/tests/07-create-slash
+++ b/external/gard/test/tests/07-create-slash
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -f test/files/blank.bin create /"
+run_binary "./opal-gard" "-p -e -f test/files/blank.bin create /"
 if [ "$?" -eq 0 ]; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/08-create-duplicate b/external/gard/test/tests/08-create-duplicate
index 7179a1468..fad5d3499 100644
--- a/external/gard/test/tests/08-create-duplicate
+++ b/external/gard/test/tests/08-create-duplicate
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-run_binary "./gard" "-p -e -8 -f test/files/data1.bin create /Sys0/Node0/Membuf0"
+run_binary "./opal-gard" "-p -e -8 -f test/files/data1.bin create /Sys0/Node0/Membuf0"
 if [ "$?" -eq 0 ]; then
 	fail_test
 fi
diff --git a/external/gard/test/tests/09-create-last-unit b/external/gard/test/tests/09-create-last-unit
index d293057d9..4d9b319cc 100644
--- a/external/gard/test/tests/09-create-last-unit
+++ b/external/gard/test/tests/09-create-last-unit
@@ -1,12 +1,12 @@
 #! /bin/sh
 
 cp test/files/blank.bin $DATA_DIR/input
-run_binary "./gard" "-9 -p -e -f $DATA_DIR/input create /MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255"
+run_binary "./opal-gard" "-9 -p -e -f $DATA_DIR/input create /MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255/MFREFCLK255"
 if [ "$?" -ne 0 ]; then
 	fail_test
 fi
 
-run_binary "./gard" "-9 -p -e -f $DATA_DIR/input list"
+run_binary "./opal-gard" "-9 -p -e -f $DATA_DIR/input list"
 if [ "$?" -ne 0 ]; then
 	fail_test
 fi
-- 
2.14.3

More information about the Skiboot mailing list