[Fuego] [PATCH 4/5] Benchmark.dbench4: add judgement for client.txt

zhongl.fnst at cn.fujitsu.com zhongl.fnst at cn.fujitsu.com
Wed Aug 22 06:40:28 UTC 2018


Details: Add an extra judgement for "/usr/share/client.txt", if "/usr/share/client.txt" does not exit,

         put client.txt from Fuego onto the target, in the board test directory, and specify option "-c".



Signed-off-by: Zhong Lu <zhongl.fnst at cn.fujitsu.com<mailto:zhongl.fnst at cn.fujitsu.com>>

---

engine/tests/Benchmark.dbench4/fuego_test.sh | 12 ++++++++++++

1 file changed, 12 insertions(+)



diff --git a/engine/tests/Benchmark.dbench4/fuego_test.sh b/engine/tests/Benchmark.dbench4/fuego_test.sh

index da823ee..24c0c6d 100755

--- a/engine/tests/Benchmark.dbench4/fuego_test.sh

+++ b/engine/tests/Benchmark.dbench4/fuego_test.sh

@@ -8,6 +8,7 @@ function test_pre_check {

     assert_define BENCHMARK_DBENCH_NPROCS

     is_on_target_path dbench PROGRAM_DBENCH

+    is_on_target client.txt FILE_CLIENT /usr/share

     if [ ! -z "$PROGRAM_DBENCH" ]; then

         help=$(cmd "dbench --help") || true

         version=$(echo $help | head -1 | cut -d' ' -f 3) @@ -42,6 +43,8 @@ function test_build {  function test_deploy {

     if [ -z "$PROGRAM_DBENCH" ]; then

         put dbench loadfiles/client.txt $BOARD_TESTDIR/fuego.$TESTDIR/

+    elif [ -z "$FILE_CLIENT" ]; then

+        put loadfiles/client.txt $BOARD_TESTDIR/fuego.$TESTDIR/

     fi

}

@@ -56,6 +59,15 @@ function test_run {

             $BENCHMARK_DBENCH_EXTRAPARAMS \

             $BENCHMARK_DBENCH_NPROCS; \

             sync"

+    # dbench4 already existing on board (without /usr/share/client.txt)

+    elif [ -z "$FILE_CLIENT" ]; then

+        report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \

+            dbench  -c ./client.txt \

+            -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR \

+            -t $BENCHMARK_DBENCH_TIMELIMIT \

+            $BENCHMARK_DBENCH_EXTRAPARAMS \

+            $BENCHMARK_DBENCH_NPROCS; \

+            sync"

     else

         report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \

             dbench -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR \

--

2.7.4






-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linuxfoundation.org/pipermail/fuego/attachments/20180822/5a9db937/attachment-0001.html>


More information about the Fuego mailing list