[LTP] execltp: fix two minor issues

[LTP] execltp: fix two minor issues

[Daniel Sangorrin]

Hi,

Please consider the following 2 patches that fix two
issues that I found when I tried to run execltp.

[PATCH 1/2] execltp: fix scenario_group naming
[PATCH 2/2] execltp: add rstrip to runtest_file

Thanks,
Daniel

[LTP] [PATCH 1/2] execltp: fix scenario_group naming

[Daniel Sangorrin]

Commit 9d5dac6 modified the folder name "scenario-groups" to
"scenario_groups" but it seems it missed changing it on
the execltp script as well.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 execltp.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/execltp.in b/execltp.in
index 470a2dc..6d13ad1 100755
--- a/execltp.in
+++ b/execltp.in
@@ -307,7 +307,7 @@ def main():
 
     if len(args) == 0:
         # Default to scenarios also used by runltp.
-        fd = open(os.path.join(ltpdir, 'scenario-groups/default'), 'r')
+        fd = open(os.path.join(ltpdir, 'scenario_groups/default'), 'r')
         try:
             args = fd.readlines()
         finally:
-- 
2.1.4

[LTP] [PATCH 2/2] execltp: add rstrip to runtest_file

[Daniel Sangorrin]

Without an rstrip I was getting errors saying that the
runtest file syscalls didn't exist.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 execltp.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/execltp.in b/execltp.in
index 6d13ad1..2dcdf10 100755
--- a/execltp.in
+++ b/execltp.in
@@ -361,7 +361,7 @@ def main():
 
             failed_subset = {}
 
-            runtest_file = os.path.join(opts.ltp_dir, 'runtest', testsuite)
+            runtest_file = os.path.join(opts.ltp_dir, 'runtest', testsuite).rstrip()
 
             if not opts.postprocess_only:
 
-- 
2.1.4

[LTP] [PATCH 1/2] execltp: fix scenario_group naming

[Cyril Hrubis]

Hi!
Pushed, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 2/2] execltp: add rstrip to runtest_file

[Cyril Hrubis]

Hi!
> Without an rstrip I was getting errors saying that the
> runtest file syscalls didn't exist.
> 
> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> ---
>  execltp.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/execltp.in b/execltp.in
> index 6d13ad1..2dcdf10 100755
> --- a/execltp.in
> +++ b/execltp.in
> @@ -361,7 +361,7 @@ def main():
>  
>              failed_subset = {}
>  
> -            runtest_file = os.path.join(opts.ltp_dir, 'runtest', testsuite)
> +            runtest_file = os.path.join(opts.ltp_dir, 'runtest', testsuite).rstrip()

I suppose that the problem here is that the fd.readlines() does include
newlines at the end of the lines. But stripping it at the point we
construct the paths seems to be a bit confusing to me.

What about something as:

diff --git a/execltp.in b/execltp.in
index 6d13ad1d7..10b1f53f3 100755
--- a/execltp.in
+++ b/execltp.in
@@ -309,7 +309,7 @@ def main():
         # Default to scenarios also used by runltp.
         fd = open(os.path.join(ltpdir, 'scenario_groups/default'), 'r')
         try:
-            args = fd.readlines()
+            args = [l.strip() for l in fd.readlines()]
         finally:
             fd.close()


-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 2/2] execltp: add rstrip to runtest_file

[Daniel Sangorrin]

Hi Cyril,

> -----Original Message-----
> From: Cyril Hrubis [mailto:chrubis@suse.cz]
> Sent: Friday, January 05, 2018 12:45 AM
> To: Daniel Sangorrin
> Cc: ltp@lists.linux.it
> Subject: Re: [LTP] [PATCH 2/2] execltp: add rstrip to runtest_file
> 
> Hi!
> > Without an rstrip I was getting errors saying that the
> > runtest file syscalls didn't exist.
> >
> > Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> > ---
> >  execltp.in | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/execltp.in b/execltp.in
> > index 6d13ad1..2dcdf10 100755
> > --- a/execltp.in
> > +++ b/execltp.in
> > @@ -361,7 +361,7 @@ def main():
> >
> >              failed_subset = {}
> >
> > -            runtest_file = os.path.join(opts.ltp_dir, 'runtest', testsuite)
> > +            runtest_file = os.path.join(opts.ltp_dir, 'runtest', testsuite).rstrip()
> 
> I suppose that the problem here is that the fd.readlines() does include
> newlines at the end of the lines. But stripping it at the point we
> construct the paths seems to be a bit confusing to me.
> 
> What about something as:
> 
> diff --git a/execltp.in b/execltp.in
> index 6d13ad1d7..10b1f53f3 100755
> --- a/execltp.in
> +++ b/execltp.in
> @@ -309,7 +309,7 @@ def main():
>          # Default to scenarios also used by runltp.
>          fd = open(os.path.join(ltpdir, 'scenario_groups/default'), 'r')
>          try:
> -            args = fd.readlines()
> +            args = [l.strip() for l in fd.readlines()]
>          finally:
>              fd.close()
> 

Sorry for the late reply.
I tested your suggestion and it worked great.

Thanks,
Daniel

[LTP] [PATCH 2/2] execltp: add rstrip to runtest_file

[Cyril Hrubis]

Hi!
> Sorry for the late reply.
> I tested your suggestion and it worked great.

Pushed, thanks for the report and testing.

-- 
Cyril Hrubis
chrubis@suse.cz