[Fuego] Add NEED_PROGRAM to need_check

* [Fuego] Add NEED_PROGRAM to need_check
@ 2018-01-31  7:58 Liu, Wenlong
  2018-02-01  1:27 ` Tim.Bird
  2018-02-07  3:16 ` Bird, Timothy
  0 siblings, 2 replies; 9+ messages in thread
From: Liu, Wenlong @ 2018-01-31  7:58 UTC (permalink / raw)
  To: fuego


[-- Attachment #1.1: Type: text/plain, Size: 339 bytes --]

Hi Tim, Daniel and other friends

I didn’t add the contents of the attachments in this mail, because I just want to confirm
that if it will be better to move those check steps from pre_check to check_needs.

If I'm not mistaken, we've talked about it on the maillist before, but I can't find that mail now.

Best regards
Liu




[-- Attachment #1.2: Type: text/html, Size: 3687 bytes --]

[-- Attachment #2: 0001-need_check-add-support-for-NEED_PROGRAM-check.patch --]
[-- Type: application/octet-stream, Size: 1903 bytes --]

From 87154b9214d8eaf08e25f9c146a6195defc8463f Mon Sep 17 00:00:00 2001
From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
Date: Tue, 30 Jan 2018 16:06:30 +0800
Subject: [PATCH 4/6] need_check: add support for NEED_PROGRAM check

Those necessary commands could be defined in fuego_test.sh,
then, Fuego will check if those commands exist in the path
that specified in $PATH of the target.

If not all necessary commands exist on the target, the current
test will be aborted, but Fuego will list the error info.

Signed-off-by: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
---
 engine/scripts/need_check.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/engine/scripts/need_check.sh b/engine/scripts/need_check.sh
index 1fd6d6d..bc0fa14 100755
--- a/engine/scripts/need_check.sh
+++ b/engine/scripts/need_check.sh
@@ -291,6 +291,26 @@ function check_root {
   fi
 }
 
+# check if those specified commands exist on board
+# $1 has single string with a list of command entries to check for
+function check_program {
+  # split $1 on whitespace, without file globbing
+  set -f
+  arg_array=($1)
+  set +f
+
+  for prg in "${arg_array[@]}" ; do
+    is_on_target_path $prg prg_path
+    if [ -z "$prg_path" ] ; then
+      echo -e "\n\nABORTED: Expected command \"$prg\" is on the target, but it's not there!"
+      return 1
+    fi
+  done
+
+  # return OK if all necessary commands exist on the target
+  return 0
+}
+
 function check_needs {
   # check for each possible need variable and process it
   if [ -n "${NEED_MEMORY}" ] ; then
@@ -325,5 +345,14 @@ function check_needs {
       return $rcode
     fi
   fi
+
+  if [ -n "${NEED_PROGRAM}" ] ; then
+    check_program "${NEED_PROGRAM}"
+    rcode=$?
+    if [ $rcode -ne 0 ] ; then
+      echo "ABORTED: \"${NEED_PROGRAM}\" are required, but not all exist on the target"
+      return $rcode
+    fi
+  fi
 }
 
-- 
2.7.4


[-- Attachment #3: 0002-imagemagick-add-pre_check-for-those-necessary-comman.patch --]
[-- Type: application/octet-stream, Size: 1024 bytes --]

From 4be785e74d42ef288861b5ee5b20c413a102b2bb Mon Sep 17 00:00:00 2001
From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
Date: Tue, 30 Jan 2018 16:15:50 +0800
Subject: [PATCH 5/6] imagemagick: add pre_check for those necessary commands

Defined the NEED_PROGRAM variable, and it will be used in
the "Test Dependencies Check" step.

Signed-off-by: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
---
 engine/tests/Functional.imagemagick/fuego_test.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engine/tests/Functional.imagemagick/fuego_test.sh b/engine/tests/Functional.imagemagick/fuego_test.sh
index b21eb77..0934afb 100755
--- a/engine/tests/Functional.imagemagick/fuego_test.sh
+++ b/engine/tests/Functional.imagemagick/fuego_test.sh
@@ -1,6 +1,8 @@
 #tarball=jpeg-6b.tar.gz
 tarball=images.tar.gz
 
+NEED_PROGRAM="convert compare mogrify composite identify conjure montage stream"
+
 function test_build {
 #    ./configure --host=$PREFIX --build=`./config.guess` CC="$CC" AR="$AR" RANLIB="$RANLIB"
 #    make
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 9+ messages in thread