[sumo,v1] strace: fix ptest path not found

Submitted by Sinan Kaya on Oct. 30, 2018, 11:28 p.m. | Patch ID: 155995

Details

Message ID 20181030232815.24575-1-okaya@kernel.org
State New
Headers show

Commit Message

Sinan Kaya Oct. 30, 2018, 11:28 p.m.
Running strace ptest is failing with file not found errors.

../../strace: Process 1990 attached
diff: ../../../ptest0/tests/strace-ff.expected: No such file or directory

Even though file is present in the /usr/lib/strace/ptest/tests
directory.

Issue is caused by sed doing a find and replace causing an incorrect
path to be generated.

Below is the srcdir and top_srcdir in the Makefile:

srcdir = ../../ptest0/tests
top_srcdir = ../../strace-4.20

Replacing this with

srcdir = .
top_srcdir = ..

old results:

Patch hide | download patch | download mbox

===================================================
30 of 373 tests failed
(117 tests were not run)
Please report to strace-devel@lists.sourceforge.net
===================================================

new results:
===================================================
13 of 373 tests failed
(117 tests were not run)
Please report to strace-devel@lists.sourceforge.net
===================================================

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 meta/recipes-devtools/strace/strace_4.20.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/strace/strace_4.20.bb b/meta/recipes-devtools/strace/strace_4.20.bb
index 869c12f65a..0b35f5443d 100644
--- a/meta/recipes-devtools/strace/strace_4.20.bb
+++ b/meta/recipes-devtools/strace/strace_4.20.bb
@@ -43,7 +43,8 @@  do_compile_ptest() {
 
 do_install_ptest() {
 	oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
-	sed -i -e '/^src/s/strace.*[1-9]/ptest/' \
+	sed -i -e 's:^srcdir =.*:srcdir = .:g' \
+	    -e 's:^top_srcdir =.*:top_srcdir = ..:g' \
 	    -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
 	    -e 's|${DEBUG_PREFIX_MAP}||g' \
 	    -e 's:${HOSTTOOLS_DIR}/::g' \

Comments

Armin Kuster Nov. 1, 2018, 11:48 p.m.
Sinan,

On 10/30/18 4:28 PM, Sinan Kaya wrote:
> Running strace ptest is failing with file not found errors.
>
> ../../strace: Process 1990 attached
> diff: ../../../ptest0/tests/strace-ff.expected: No such file or directory
>
> Even though file is present in the /usr/lib/strace/ptest/tests
> directory.
>
> Issue is caused by sed doing a find and replace causing an incorrect
> path to be generated.
>
> Below is the srcdir and top_srcdir in the Makefile:
>
> srcdir = ../../ptest0/tests
> top_srcdir = ../../strace-4.20

Do you know if this affects Master?

- armin

>
> Replacing this with
>
> srcdir = .
> top_srcdir = ..
>
> old results:
> ===================================================
> 30 of 373 tests failed
> (117 tests were not run)
> Please report to strace-devel@lists.sourceforge.net
> ===================================================
>
> new results:
> ===================================================
> 13 of 373 tests failed
> (117 tests were not run)
> Please report to strace-devel@lists.sourceforge.net
> ===================================================
>
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  meta/recipes-devtools/strace/strace_4.20.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/strace/strace_4.20.bb b/meta/recipes-devtools/strace/strace_4.20.bb
> index 869c12f65a..0b35f5443d 100644
> --- a/meta/recipes-devtools/strace/strace_4.20.bb
> +++ b/meta/recipes-devtools/strace/strace_4.20.bb
> @@ -43,7 +43,8 @@ do_compile_ptest() {
>  
>  do_install_ptest() {
>  	oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
> -	sed -i -e '/^src/s/strace.*[1-9]/ptest/' \
> +	sed -i -e 's:^srcdir =.*:srcdir = .:g' \
> +	    -e 's:^top_srcdir =.*:top_srcdir = ..:g' \
>  	    -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
>  	    -e 's|${DEBUG_PREFIX_MAP}||g' \
>  	    -e 's:${HOSTTOOLS_DIR}/::g' \
Sinan Kaya Nov. 2, 2018, 12:43 a.m.
On 11/1/2018 7:48 PM, akuster808 wrote:
>> srcdir = ../../ptest0/tests
>> top_srcdir = ../../strace-4.20
> Do you know if this affects Master?

I have not tested master but I have seen the same issue there.
I looked for a solution at master before debugging this.