[LTP] [PATCH 0/2] Travis build fixes

[LTP] [PATCH 0/2] Travis build fixes

[Petr Vorel]

Hi,

FYI only first commit is required to fix travis failures.

Kind regards,
Petr

Petr Vorel (2):
  docparse/parse.sh: Fix parsing on dash
  docparse/parse.sh: Fix running with relative path

 docparse/parse.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
2.29.2

[LTP] [PATCH 1/2] docparse/parse.sh: Fix parsing on dash

[Petr Vorel]

bash keeps escape sequences (e.g. \t and \n) when using echo:

$ a="-v\tverbose output\n"; echo "$a"
-v\tverbose output\n
$

But dash interprets them (behaves like echo -e on bash):

$ a="-v\tverbose output\n"; echo -e "$a"
-e -v	verbose output

$

Using printf does not help, because it'd have to be separated with --
which cannot be used for printing variables.
Fortunately cat << EOF redirection is portable.
In the future we should probably avoid shell as much as possible.

Fixes: 0962c9a37 ("syscalls/perf_event_open02: Use anonymous .options")

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 docparse/parse.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docparse/parse.sh b/docparse/parse.sh
index 4ae0c42b2..172eab702 100755
--- a/docparse/parse.sh
+++ b/docparse/parse.sh
@@ -32,7 +32,9 @@ for test in `find testcases/ -name '*.c'`; do
 			echo ','
 		fi
 		first=
-		echo -n "$a"
+		cat <<EOF
+$a
+EOF
 	fi
 done
 
-- 
2.29.2

[LTP] [PATCH 2/2] docparse/parse.sh: Fix running with relative path

[Petr Vorel]

that's not needed for build, but useful for debugging.

Running as ./parse.sh fails:
cat: ./../VERSION: No such file or directory

top_srcdir must be absolute path.

Fixes: a069cd36b ("docparse: Add test documentation parser")

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 docparse/parse.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docparse/parse.sh b/docparse/parse.sh
index 172eab702..79011bc10 100755
--- a/docparse/parse.sh
+++ b/docparse/parse.sh
@@ -5,7 +5,7 @@
 set -e
 
 top_builddir=$PWD/..
-top_srcdir="$(dirname $0)/.."
+top_srcdir="$(cd $(dirname $0)/..; pwd)"
 
 cd $top_srcdir
 
-- 
2.29.2

[LTP] [PATCH 1/2] docparse/parse.sh: Fix parsing on dash

[Cyril Hrubis]

Hi!
> bash keeps escape sequences (e.g. \t and \n) when using echo:
> 
> $ a="-v\tverbose output\n"; echo "$a"
> -v\tverbose output\n
> $
> 
> But dash interprets them (behaves like echo -e on bash):
> 
> $ a="-v\tverbose output\n"; echo -e "$a"
> -e -v	verbose output

Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

Can we remove the \t from the perf_event_open02.c as well please? I
doubt that it will do any good when we pass the strings into asciidoc
parser...

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 2/2] docparse/parse.sh: Fix running with relative path

[Cyril Hrubis]

Hi!
> that's not needed for build, but useful for debugging.
> 
> Running as ./parse.sh fails:
> cat: ./../VERSION: No such file or directory
> 
> top_srcdir must be absolute path.
> 
> Fixes: a069cd36b ("docparse: Add test documentation parser")
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
>  docparse/parse.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/docparse/parse.sh b/docparse/parse.sh
> index 172eab702..79011bc10 100755
> --- a/docparse/parse.sh
> +++ b/docparse/parse.sh
> @@ -5,7 +5,7 @@
>  set -e
>  
>  top_builddir=$PWD/..
> -top_srcdir="$(dirname $0)/.."
> +top_srcdir="$(cd $(dirname $0)/..; pwd)"
>  
>  cd $top_srcdir

Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 1/2] docparse/parse.sh: Fix parsing on dash

[Petr Vorel]

> Hi!
> > bash keeps escape sequences (e.g. \t and \n) when using echo:

> > $ a="-v\tverbose output\n"; echo "$a"
> > -v\tverbose output\n
> > $

> > But dash interprets them (behaves like echo -e on bash):

> > $ a="-v\tverbose output\n"; echo -e "$a"
> > -e -v	verbose output

> Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Thanks for both reviews!

> Can we remove the \t from the perf_event_open02.c as well please? I
> doubt that it will do any good when we pass the strings into asciidoc
> parser...
Sure, I'll replace it with <tab>.

Kind regards,
Petr

[LTP] [PATCH 1/2] docparse/parse.sh: Fix parsing on dash

[Petr Vorel]

> Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

Both patches merged, thanks!

Kind regards,
Petr