[Fuego] [PATCH 1/3] chart: https protocol support in Jenkins path

[Fuego] [PATCH 1/3] chart: https protocol support in Jenkins path

[Li Xiaoming]

From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>

Using flexible protocol to get the test results

Signed-off-by: Kyohei Oki <kyohhei.oki@denso-ten.com>
---
 engine/scripts/mod.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/scripts/mod.js b/engine/scripts/mod.js
index c23dca4..d9074cc 100644
--- a/engine/scripts/mod.js
+++ b/engine/scripts/mod.js
@@ -24,7 +24,7 @@ jQuery.noConflict();
 jQuery(document).ready(function () {
 
 // Jenkins logs path
-var jenkins_logs_path = 'http://'+location['host'] + '/fuego/userContent/fuego.logs/';
+var jenkins_logs_path = location['protocol'] + '//' + location['host'] + '/fuego/userContent/fuego.logs/';
 
 // get the test name from the URL
 var localurl = jQuery(location).attr('href').split("/");
-- 
2.7.4

[Fuego] [PATCH 2/3] IOzone: change excel suffix from xlsx to xls

[Li Xiaoming]

From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>

IOzone does not support xlsx format output.

Signed-off-by: Kyohei Oki <kyohhei.oki@denso-ten.com>
---
 engine/tests/Benchmark.IOzone/fuego_test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/tests/Benchmark.IOzone/fuego_test.sh b/engine/tests/Benchmark.IOzone/fuego_test.sh
index 7e24ce4..341829e 100755
--- a/engine/tests/Benchmark.IOzone/fuego_test.sh
+++ b/engine/tests/Benchmark.IOzone/fuego_test.sh
@@ -39,8 +39,8 @@ function test_deploy {
 function test_run {
     hd_test_mount_prepare $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT
 
-    report "cd $BENCHMARK_IOZONE_MOUNT_POINT; $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -O -R -b $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx -g $BENCHMARK_IOZONE_FILE_SIZE"
-    get $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx ${LOGDIR}/results.xlsx
+    report "cd $BENCHMARK_IOZONE_MOUNT_POINT; $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -O -R -b $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xls -g $BENCHMARK_IOZONE_FILE_SIZE"
+    get $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xls ${LOGDIR}/results.xls
 
     hd_test_clean_umount $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT
 }
-- 
2.7.4

[Fuego] [PATCH 3/3] nbench_byte: add another choice that can do dynamic compilation

[Li Xiaoming]

Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
---
 engine/tests/Benchmark.nbench_byte/fuego_test.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/engine/tests/Benchmark.nbench_byte/fuego_test.sh b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
index d4a8336..08adb4a 100755
--- a/engine/tests/Benchmark.nbench_byte/fuego_test.sh
+++ b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
@@ -1,9 +1,19 @@
 tarball=nbench-byte-2.2.3.tar.gz
 
+function test_pre_check {
+    is_on_sdk libm.a LIBM /lib:/usr/lib/:/usr/local/lib
+}
+
 function test_build {
     patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
     rm -f pointer.h && touch pointer.h
-    CFLAGS+=" -s -static -Wall -O3"
+
+    if [ -z $LIBM ]; then
+       CFLAGS+=" -s -Wall -O3"
+    else
+       CFLAGS+=" -s -static -Wall -O3"
+    fi
+
     make CFLAGS="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
 }
 
-- 
2.7.4

Re: [Fuego] [PATCH 3/3] nbench_byte: add another choice that can do dynamic compilation

[Daniel Sangorrin]

> -----Original Message-----
> From: fuego-bounces@lists.linuxfoundation.org
> <fuego-bounces@lists.linuxfoundation.org> On Behalf Of Li Xiaoming
> Sent: Monday, July 2, 2018 11:52 PM
> To: fuego@lists.linuxfoundation.org
> Subject: [Fuego] [PATCH 3/3] nbench_byte: add another choice that can do dynamic
> compilation
> 
> Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
> ---
>  engine/tests/Benchmark.nbench_byte/fuego_test.sh | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> index d4a8336..08adb4a 100755
> --- a/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> +++ b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> @@ -1,9 +1,19 @@
>  tarball=nbench-byte-2.2.3.tar.gz
> 
> +function test_pre_check {
> +    is_on_sdk libm.a LIBM /lib:/usr/lib/:/usr/local/lib
> +}
> +
>  function test_build {
>      patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
>      rm -f pointer.h && touch pointer.h
> -    CFLAGS+=" -s -static -Wall -O3"
> +
> +    if [ -z $LIBM ]; then
> +       CFLAGS+=" -s -Wall -O3"
> +    else
> +       CFLAGS+=" -s -static -Wall -O3"
> +    fi
> +
>      make CFLAGS="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB"
> CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
>  }

Thanks Li, it looks good to me.

Daniel

Re: [Fuego] [PATCH 2/3] IOzone: change excel suffix from xlsx to xls

[Daniel Sangorrin]

> -----Original Message-----
> From: fuego-bounces@lists.linuxfoundation.org
> <fuego-bounces@lists.linuxfoundation.org> On Behalf Of Li Xiaoming
> Sent: Monday, July 2, 2018 11:52 PM
> To: fuego@lists.linuxfoundation.org
> Cc: Kyohei Oki <kyohhei.oki@denso-ten.com>
> Subject: [Fuego] [PATCH 2/3] IOzone: change excel suffix from xlsx to xls
> 
> From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
> 
> IOzone does not support xlsx format output.
> 
> Signed-off-by: Kyohei Oki <kyohhei.oki@denso-ten.com>
> ---
>  engine/tests/Benchmark.IOzone/fuego_test.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/engine/tests/Benchmark.IOzone/fuego_test.sh
> b/engine/tests/Benchmark.IOzone/fuego_test.sh
> index 7e24ce4..341829e 100755
> --- a/engine/tests/Benchmark.IOzone/fuego_test.sh
> +++ b/engine/tests/Benchmark.IOzone/fuego_test.sh
> @@ -39,8 +39,8 @@ function test_deploy {
>  function test_run {
>      hd_test_mount_prepare $BENCHMARK_IOZONE_MOUNT_BLOCKDEV
> $BENCHMARK_IOZONE_MOUNT_POINT
> 
> -    report "cd $BENCHMARK_IOZONE_MOUNT_POINT;
> $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -O -R
> -b
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx
> -g $BENCHMARK_IOZONE_FILE_SIZE"
> -    get
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx
> ${LOGDIR}/results.xlsx
> +    report "cd $BENCHMARK_IOZONE_MOUNT_POINT;
> $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -O -R
> -b
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xls
> -g $BENCHMARK_IOZONE_FILE_SIZE"
> +    get
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xls
> ${LOGDIR}/results.xls
> 
>      hd_test_clean_umount $BENCHMARK_IOZONE_MOUNT_BLOCKDEV
> $BENCHMARK_IOZONE_MOUNT_POINT
>  }
> --
> 2.7.4
> 

Good catch, thank you.
Daniel

Re: [Fuego] [PATCH 1/3] chart: https protocol support in Jenkins path

[Tim.Bird]

Sorry for the slow response. Just getting back from vacation and back
into the swing of things.

> -----Original Message-----
> From: Li Xiaoming
> Subject: [Fuego] [PATCH 1/3] chart: https protocol support in Jenkins path
> 
> From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
> 
> Using flexible protocol to get the test results
> 
> Signed-off-by: Kyohei Oki <kyohhei.oki@denso-ten.com>
It's a little strange to have the e-mail From:, the patch
author From:,  and Signed-off-by: lines all have different people.

According to this, the patch was written by Liu Wenlong,
mailed by Li Xiaoming, but asserted to be legally OK by
Kyohei Oki.

In the future, if you have different people involved in the patch,
please have the person who e-mails the patch also
include a Signed-off-by: line for the patch.  This can be in addition
to the Signed-off-by: line(s) for other people involved in
the patch creation and review.
  
> ---
>  engine/scripts/mod.js | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/engine/scripts/mod.js b/engine/scripts/mod.js
> index c23dca4..d9074cc 100644
> --- a/engine/scripts/mod.js
> +++ b/engine/scripts/mod.js
> @@ -24,7 +24,7 @@ jQuery.noConflict();
>  jQuery(document).ready(function () {
> 
>  // Jenkins logs path
> -var jenkins_logs_path = 'http://'+location['host'] +
> '/fuego/userContent/fuego.logs/';
> +var jenkins_logs_path = location['protocol'] + '//' + location['host'] +
> '/fuego/userContent/fuego.logs/';
> 
>  // get the test name from the URL
>  var localurl = jQuery(location).attr('href').split("/");
> --
> 2.7.4

This is a great fix!  Thanks very much for the patch!
Applied and pushed in my master branch
 -- Tim

Re: [Fuego] [PATCH 2/3] IOzone: change excel suffix from xlsx to xls

[Tim.Bird]

> -----Original Message-----
> From: Li Xiaoming
> Subject: [Fuego] [PATCH 2/3] IOzone: change excel suffix from xlsx to xls
> 
> From: Liu Wenlong <liuwl.fnst@cn.fujitsu.com>
> 
> IOzone does not support xlsx format output.
> 
> Signed-off-by: Kyohei Oki <kyohhei.oki@denso-ten.com>
> ---
>  engine/tests/Benchmark.IOzone/fuego_test.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/engine/tests/Benchmark.IOzone/fuego_test.sh
> b/engine/tests/Benchmark.IOzone/fuego_test.sh
> index 7e24ce4..341829e 100755
> --- a/engine/tests/Benchmark.IOzone/fuego_test.sh
> +++ b/engine/tests/Benchmark.IOzone/fuego_test.sh
> @@ -39,8 +39,8 @@ function test_deploy {
>  function test_run {
>      hd_test_mount_prepare $BENCHMARK_IOZONE_MOUNT_BLOCKDEV
> $BENCHMARK_IOZONE_MOUNT_POINT
> 
> -    report "cd $BENCHMARK_IOZONE_MOUNT_POINT;
> $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -
> O -R -b
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.x
> lsx -g $BENCHMARK_IOZONE_FILE_SIZE"
> -    get
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.x
> lsx ${LOGDIR}/results.xlsx
> +    report "cd $BENCHMARK_IOZONE_MOUNT_POINT;
> $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -
> O -R -b
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.x
> ls -g $BENCHMARK_IOZONE_FILE_SIZE"
> +    get
> $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.x
> ls ${LOGDIR}/results.xls
> 
>      hd_test_clean_umount $BENCHMARK_IOZONE_MOUNT_BLOCKDEV
> $BENCHMARK_IOZONE_MOUNT_POINT
>  }
> --
> 2.7.4


Nice fix!

Applied and pushed to my master branch.
 -- Tim

Re: [Fuego] [PATCH 3/3] nbench_byte: add another choice that can do dynamic compilation

[Tim.Bird]

> -----Original Message-----
> From: Li Xiaoming
> Subject: [Fuego] [PATCH 3/3] nbench_byte: add another choice that can do
> dynamic compilation
> 
> Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
> ---
>  engine/tests/Benchmark.nbench_byte/fuego_test.sh | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> index d4a8336..08adb4a 100755
> --- a/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> +++ b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> @@ -1,9 +1,19 @@
>  tarball=nbench-byte-2.2.3.tar.gz
> 
> +function test_pre_check {
> +    is_on_sdk libm.a LIBM /lib:/usr/lib/:/usr/local/lib
> +}
> +
>  function test_build {
>      patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
>      rm -f pointer.h && touch pointer.h
> -    CFLAGS+=" -s -static -Wall -O3"
> +
> +    if [ -z $LIBM ]; then
> +       CFLAGS+=" -s -Wall -O3"
> +    else
> +       CFLAGS+=" -s -static -Wall -O3"
> +    fi
> +
>      make CFLAGS="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB"
> CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
>  }
> 
> --
> 2.7.4

Thanks for this patch.  The patch itself is good. 

But when I tested it, it revealed some
inconsistencies in how Fuego uses SDKROOT.  For many tests, SDKROOT
is used like a sysroot.  For example it is used as the argument to
configure, like so: "configure  ... --sysroot=$SDKROOT.  In other tests
it is used more like the root directory for include and lib stuff, like so:
"configure --includedir=$SDKROOT/usr/include ...".  Unfortunately,
these are not exactly compatible.  The way "is_on_sdk" uses
SDKROOT will work for SDKROOTs set by poky, but not for the
Debian cross-toolchains scripts (e.g. debian-armhf-tools.sh).

Resolving this problem will require some more work on my part.
However, this is a good fix that I'll apply now, and I will try to fixup
the other issues subsequently.  This may actually explain why some
of the tests have build issues for some boards.

Thanks for the patch.
 -- Tim

P.S. I'm rewording the patch description slightly.  I hope that's OK.