[Fuego] [PATCH] functions: Support for test sets with a horizontal line in the name.

[Fuego] [PATCH] functions: Support for test sets with a horizontal line in the name.

[Wang Mingyu]

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 scripts/functions.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/functions.sh b/scripts/functions.sh
index 5251dd9..56e39cc 100755
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -147,10 +147,11 @@ function untar {
 #   spec gitrepo > spec tarball > fuego_test gitrepo > fuego_test tarball
 function unpack {
     # prepare variables
-    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
-    spec_gitrepo="${upName}_GITREPO"
-    spec_gitref="${upName}_GITREF"
-    spec_tarball="${upName}_TARBALL"
+    upName="${TESTDIR^^}"
+    specName="${upName//[-,.]/_}"
+    spec_gitrepo="${specName}_GITREPO"
+    spec_gitref="${specName}_GITREF"
+    spec_tarball="${specName}_TARBALL"
     # 1) spec gitrepo
     if [ ! -z "${!spec_gitrepo}" ]; then
         gitrepo=${!spec_gitrepo}
@@ -394,7 +395,8 @@ function pre_build {
     # If the spec requests it, create a job-specifc
     # build directory.
     # e.g. "PER_JOB_BUILD": "true" in spec file
-    pjName=`echo "${TESTDIR^^}_PER_JOB_BUILD"| tr '.' '_'`
+    upName="${TESTDIR^^}"
+    pjName="${upName//[-,.]/_}_PER_JOB_BUILD"
     if [ "${!pjName}" == "true" ] ; then
         mkdir -p $JOB_BUILD_DIR
     else
@@ -696,8 +698,8 @@ function fail_check_cases () {
     testlog="${LOGDIR}/testlog.txt"
     slog_prefix="${LOGDIR}/syslog"
 
-    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
-    fcname="${upName}"_FAIL_CASE_COUNT
+    upName="${TESTDIR^^}"
+    fcname="${upName//[-,.]/_}_FAIL_CASE_COUNT"
 
     fcc="${!fcname}"
 
-- 
1.8.3.1

Re: [Fuego] [PATCH] functions: Support for test sets with a horizontal line in the name.

[Tim.Bird]

I've applied this, because I like the removal of the call to 'tr',
and handling more characters makes the code more robust.

However, any test with a '-' or ',' in the name would violate
the Fuego naming rules.  See
http://fuegotest.org/wiki/Fuego_naming_rules#Fuego_test_name

 Thanks for the patch.
 -- Tim

> -----Original Message-----
> From: Wang Mingyu
> 
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
>  scripts/functions.sh | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/functions.sh b/scripts/functions.sh
> index 5251dd9..56e39cc 100755
> --- a/scripts/functions.sh
> +++ b/scripts/functions.sh
> @@ -147,10 +147,11 @@ function untar {
>  #   spec gitrepo > spec tarball > fuego_test gitrepo > fuego_test tarball
>  function unpack {
>      # prepare variables
> -    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
> -    spec_gitrepo="${upName}_GITREPO"
> -    spec_gitref="${upName}_GITREF"
> -    spec_tarball="${upName}_TARBALL"
> +    upName="${TESTDIR^^}"
> +    specName="${upName//[-,.]/_}"
> +    spec_gitrepo="${specName}_GITREPO"
> +    spec_gitref="${specName}_GITREF"
> +    spec_tarball="${specName}_TARBALL"
>      # 1) spec gitrepo
>      if [ ! -z "${!spec_gitrepo}" ]; then
>          gitrepo=${!spec_gitrepo}
> @@ -394,7 +395,8 @@ function pre_build {
>      # If the spec requests it, create a job-specifc
>      # build directory.
>      # e.g. "PER_JOB_BUILD": "true" in spec file
> -    pjName=`echo "${TESTDIR^^}_PER_JOB_BUILD"| tr '.' '_'`
> +    upName="${TESTDIR^^}"
> +    pjName="${upName//[-,.]/_}_PER_JOB_BUILD"
>      if [ "${!pjName}" == "true" ] ; then
>          mkdir -p $JOB_BUILD_DIR
>      else
> @@ -696,8 +698,8 @@ function fail_check_cases () {
>      testlog="${LOGDIR}/testlog.txt"
>      slog_prefix="${LOGDIR}/syslog"
> 
> -    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
> -    fcname="${upName}"_FAIL_CASE_COUNT
> +    upName="${TESTDIR^^}"
> +    fcname="${upName//[-,.]/_}_FAIL_CASE_COUNT"
> 
>      fcc="${!fcname}"
> 
> --
> 1.8.3.1
> 
> 
> 
> _______________________________________________
> Fuego mailing list
> Fuego@lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego

Re: [Fuego] [PATCH] functions: Support for test sets with a horizontal line in the name.

[Wang, Mingyu]

Hi Tim，

There are some services or commands, the original name of which are with a '-'. Such as syslog-ng and net-tools. In this case, when the test set is named, should the '-' be changed to underscore or directly removed.
 Also, does it need to follow the same principle when naming the test case?

by Wangmy

-----Original Message-----
From: Tim.Bird@sony.com [mailto:Tim.Bird@sony.com] 
Sent: Thursday, May 02, 2019 8:59 AM
To: Wang, Mingyu/王 鸣瑜 <wangmy@cn.fujitsu.com>; fuego@lists.linuxfoundation.org
Subject: RE: [Fuego] [PATCH] functions: Support for test sets with a horizontal line in the name.

I've applied this, because I like the removal of the call to 'tr', and handling more characters makes the code more robust.

However, any test with a '-' or ',' in the name would violate the Fuego naming rules.  See http://fuegotest.org/wiki/Fuego_naming_rules#Fuego_test_name

 Thanks for the patch.
 -- Tim

> -----Original Message-----
> From: Wang Mingyu
> 
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
>  scripts/functions.sh | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/scripts/functions.sh b/scripts/functions.sh index 
> 5251dd9..56e39cc 100755
> --- a/scripts/functions.sh
> +++ b/scripts/functions.sh
> @@ -147,10 +147,11 @@ function untar {
>  #   spec gitrepo > spec tarball > fuego_test gitrepo > fuego_test tarball
>  function unpack {
>      # prepare variables
> -    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
> -    spec_gitrepo="${upName}_GITREPO"
> -    spec_gitref="${upName}_GITREF"
> -    spec_tarball="${upName}_TARBALL"
> +    upName="${TESTDIR^^}"
> +    specName="${upName//[-,.]/_}"
> +    spec_gitrepo="${specName}_GITREPO"
> +    spec_gitref="${specName}_GITREF"
> +    spec_tarball="${specName}_TARBALL"
>      # 1) spec gitrepo
>      if [ ! -z "${!spec_gitrepo}" ]; then
>          gitrepo=${!spec_gitrepo}
> @@ -394,7 +395,8 @@ function pre_build {
>      # If the spec requests it, create a job-specifc
>      # build directory.
>      # e.g. "PER_JOB_BUILD": "true" in spec file
> -    pjName=`echo "${TESTDIR^^}_PER_JOB_BUILD"| tr '.' '_'`
> +    upName="${TESTDIR^^}"
> +    pjName="${upName//[-,.]/_}_PER_JOB_BUILD"
>      if [ "${!pjName}" == "true" ] ; then
>          mkdir -p $JOB_BUILD_DIR
>      else
> @@ -696,8 +698,8 @@ function fail_check_cases () {
>      testlog="${LOGDIR}/testlog.txt"
>      slog_prefix="${LOGDIR}/syslog"
> 
> -    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
> -    fcname="${upName}"_FAIL_CASE_COUNT
> +    upName="${TESTDIR^^}"
> +    fcname="${upName//[-,.]/_}_FAIL_CASE_COUNT"
> 
>      fcc="${!fcname}"
> 
> --
> 1.8.3.1
> 
> 
> 
> _______________________________________________
> Fuego mailing list
> Fuego@lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego

Re: [Fuego] [PATCH] functions: Support for test sets with a horizontal line in the name.

[Tim.Bird]

> -----Original Message-----
> From: Wang, Mingyu
> 
> Hi Tim，
> 
> There are some services or commands, the original name of which are with a
> '-'. Such as syslog-ng and net-tools. In this case, when the test set is named,
> should the '-' be changed to underscore or directly removed.

It is desirable to have the test name be as
close as possible to the component that it's testing.  However, the reason for
the no-dash policy is that a dash ('-') is used as the delimiter for parts of the run
identifier  (see 'ftc list-runs -q').  The run identifier used to have as part of its name
a timestamp, which had multiple dashes.  However, it doesn't have a timestamp
element currently.  It might be possible to allow dashes in the test name, if we
restrict other elements of the run identifier to a known number of dashes, or
alternatively use a different delimiter.

Let me think about the issues here and let you know if we will keep the
no-dash policy.  If we do, then yes, we would change a dash in the program
name to an underscore.

>  Also, does it need to follow the same principle when naming the test case?
The test case name uses periods ('.') as the delimiter, so it's OK to use dashes
in the name.

 -- Tim


> 
> by Wangmy
> 
> -----Original Message-----
> From: Tim.Bird@sony.com [mailto:Tim.Bird@sony.com]
> Sent: Thursday, May 02, 2019 8:59 AM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@cn.fujitsu.com>;
> fuego@lists.linuxfoundation.org
> Subject: RE: [Fuego] [PATCH] functions: Support for test sets with a
> horizontal line in the name.
> 
> I've applied this, because I like the removal of the call to 'tr', and handling
> more characters makes the code more robust.
> 
> However, any test with a '-' or ',' in the name would violate the Fuego naming
> rules.  See
> http://fuegotest.org/wiki/Fuego_naming_rules#Fuego_test_name
> 
>  Thanks for the patch.
>  -- Tim
> 
> > -----Original Message-----
> > From: Wang Mingyu
> >
> > Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> > ---
> >  scripts/functions.sh | 16 +++++++++-------
> >  1 file changed, 9 insertions(+), 7 deletions(-)
> >
> > diff --git a/scripts/functions.sh b/scripts/functions.sh index
> > 5251dd9..56e39cc 100755
> > --- a/scripts/functions.sh
> > +++ b/scripts/functions.sh
> > @@ -147,10 +147,11 @@ function untar {
> >  #   spec gitrepo > spec tarball > fuego_test gitrepo > fuego_test tarball
> >  function unpack {
> >      # prepare variables
> > -    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
> > -    spec_gitrepo="${upName}_GITREPO"
> > -    spec_gitref="${upName}_GITREF"
> > -    spec_tarball="${upName}_TARBALL"
> > +    upName="${TESTDIR^^}"
> > +    specName="${upName//[-,.]/_}"
> > +    spec_gitrepo="${specName}_GITREPO"
> > +    spec_gitref="${specName}_GITREF"
> > +    spec_tarball="${specName}_TARBALL"
> >      # 1) spec gitrepo
> >      if [ ! -z "${!spec_gitrepo}" ]; then
> >          gitrepo=${!spec_gitrepo}
> > @@ -394,7 +395,8 @@ function pre_build {
> >      # If the spec requests it, create a job-specifc
> >      # build directory.
> >      # e.g. "PER_JOB_BUILD": "true" in spec file
> > -    pjName=`echo "${TESTDIR^^}_PER_JOB_BUILD"| tr '.' '_'`
> > +    upName="${TESTDIR^^}"
> > +    pjName="${upName//[-,.]/_}_PER_JOB_BUILD"
> >      if [ "${!pjName}" == "true" ] ; then
> >          mkdir -p $JOB_BUILD_DIR
> >      else
> > @@ -696,8 +698,8 @@ function fail_check_cases () {
> >      testlog="${LOGDIR}/testlog.txt"
> >      slog_prefix="${LOGDIR}/syslog"
> >
> > -    upName=`echo "${TESTDIR^^}"| tr '.' '_'`
> > -    fcname="${upName}"_FAIL_CASE_COUNT
> > +    upName="${TESTDIR^^}"
> > +    fcname="${upName//[-,.]/_}_FAIL_CASE_COUNT"
> >
> >      fcc="${!fcname}"
> >
> > --
> > 1.8.3.1
> >
> >
> >
> > _______________________________________________
> > Fuego mailing list
> > Fuego@lists.linuxfoundation.org
> > https://lists.linuxfoundation.org/mailman/listinfo/fuego
> 
> 
> 
> 
> _______________________________________________
> Fuego mailing list
> Fuego@lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego