[Fuego] [PATCH v2] lmbench: Use 'SCRIPTS_PATH' to specify distribution installed binaries path

[email protected] Fri, 29 Oct 2021 15:44:18 +0530
Newsgroups dev.linux.lists.fuego
Message-ID <[email protected]>
From: venkata pyla <[email protected]>

Use 'SCRIPTS_PATH' variable to specify lmbench scripts directory if the
lmbench is installed by distribution, and then use get_program_path to
search the binaries in the 'SCRIPTS_PATH'.

default 'SCRIPTS_PATH' directory is $BOARD_TESTDIR/fuego.$TESTDIR/scripts
and can be specify using --dynamic-vars

$ ftc run-test -b local -t Benchmark.lmbench2 -p ptrca \
               --dynamic-vars "{'SCRIPTS_PATH':'/usr/lib/lmbench/scripts'}"

Signed-off-by: venkata pyla <[email protected]>
---
 tests/Benchmark.lmbench2/fuego_test.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/Benchmark.lmbench2/fuego_test.sh b/tests/Benchmark.lmbench2/fuego_test.sh
index d07606c..02a3b8e 100755
--- a/tests/Benchmark.lmbench2/fuego_test.sh
+++ b/tests/Benchmark.lmbench2/fuego_test.sh
@@ -22,20 +22,23 @@ function test_deploy {
 }
 
 function test_run {
+   if [ -z "$BENCHMARK_LMBENCH2_SCRIPTS_PATH" ]; then
+      SCRIPTS_PATH="$BOARD_TESTDIR/fuego.$TESTDIR/scripts"
+   else
+      SCRIPTS_PATH="$BENCHMARK_LMBENCH2_SCRIPTS_PATH"
+   fi
+
    # some trickery to get the directory right
    if [ -n "$PREFIX" ] ; then
       LMBENCH_OS=`ls ./bin`
    else
-      LMBENCH_OS=`ls ./bin`
-      echo "lmbench_os: $LMBENCH_OS"
-      echo "curr path: $(pwd)"
-      LMBENCH_OS=$(scripts/os)
-      echo "lmbench_os: $LMBENCH_OS"
+      get_program_path os $SCRIPTS_PATH $BOARD_TESTDIR/fuego.$TESTDIR/scripts/os
+      LMBENCH_OS=$(safe_cmd "$PROGRAM_OS")
    fi
-   safe_cmd "rm -rf $BOARD_TESTDIR/fuego.$TESTDIR/results"
-   safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./config-run"
-   safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./results"
-   report "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; ./getsummary ../results/$LMBENCH_OS/*.0"
+   safe_cmd "rm -rf $SCRIPTS_PATH/../results"
+   safe_cmd "cd $SCRIPTS_PATH; OS=$LMBENCH_OS ./config-run"
+   safe_cmd "cd $SCRIPTS_PATH; OS=$LMBENCH_OS ./results"
+   report "cd $SCRIPTS_PATH; ./getsummary ../results/$LMBENCH_OS/*.0"
 }
 
 function test_cleanup {
-- 
2.20.1