Skip to contentSkip to conversation

elfutils: add ptest support

PATCH Superseded [email protected] 2 participants 4 messages Apr 12, 2019 – Apr 16, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 elfutils: add ptest support

From: Mingli Yu <[email protected]>

Add testsuite-ignore-elflint.diff from debian
(http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz)
to fix below ptest failure:
| ./run-strip-strmerge.sh: line 33: testrun_on_self_skip: command not found | FAIL: run-strip-strmerge.sh

Add check for gcc for two test cases such as
run-strip-nothing.sh and run-strip-g.sh which
depends on gcc at run time.

---
 meta/recipes-devtools/elfutils/elfutils_0.176.bb   | 27 ++++++++++-
 .../0001-skip-the-test-when-gcc-not-deployed.patch | 45 +++++++++++++++++++
 .../files/debian/testsuite-ignore-elflint.diff     | 52 ++++++++++++++++++++++
 meta/recipes-devtools/elfutils/files/run-ptest     |  6 +++
 .../elfutils/files/serial-tests.patch              | 28 ++++++++++++
 5 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
 create mode 100644 meta/recipes-devtools/elfutils/files/debian/testsuite-ignore-elflint.diff
 create mode 100644 meta/recipes-devtools/elfutils/files/run-ptest
 create mode 100644 meta/recipes-devtools/elfutils/files/serial-tests.patch
meta/recipes-devtools/elfutils/elfutils_0.176.bb +26 -1
index fd901c9..917c296 100644
@@ -27,16 +27,24 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://debian/hurd_path.patch \
            file://debian/ignore_strmerge.diff \
            file://debian/disable_werror.patch \
+           file://debian/testsuite-ignore-elflint.diff \
+           file://0001-skip-the-test-when-gcc-not-deployed.patch \
+           file://run-ptest \
+           file://serial-tests.patch \
            "
 SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
 
 SRC_URI[md5sum] = "077e4f49320cad82bf17a997068b1db9"
 SRC_URI[sha256sum] = "eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023"
 
-inherit autotools gettext
+inherit autotools gettext ptest
 
 EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
 EXTRA_OECONF_append_class-native = " --without-bzlib"
+# gcc has been added to blacklist, we will find workaround solution
+RDEPENDS_${PN}-ptest = "libasm libelf bash"
+
+EXTRA_OECONF_append_class-target += "--enable-tests-rpath"
 
 do_install_append() {
 	if [ "${TARGET_ARCH}" != "x86_64" ] && [ -z `echo "${TARGET_ARCH}"|grep 'i.86'` ];then
@@ -44,6 +52,23 @@ do_install_append() {
 	fi
 }
 
+do_compile_ptest() {
+	cd ${B}/tests
+	oe_runmake buildtest-TESTS
+}
+
+do_install_ptest() {
+	if [ ${PTEST_ENABLED} = "1" ]; then
+		cp -r ${S}/tests/                       ${D}${PTEST_PATH}
+		cp -r ${B}/tests/*                      ${D}${PTEST_PATH}/tests
+		cp -r ${B}/src                          ${D}${PTEST_PATH}
+		cp -r ${B}/config.h                     ${D}${PTEST_PATH}
+		cp -r ${B}/backends                     ${D}${PTEST_PATH}
+		sed -i '/^Makefile:/c Makefile:'        ${D}${PTEST_PATH}/tests/Makefile
+		find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {}
+	fi
+}
+
 EXTRA_OEMAKE_class-native = ""
 EXTRA_OEMAKE_class-nativesdk = ""
 
meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch new file +45 -0

45 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/debian/testsuite-ignore-elflint.diff new file +52 -0

52 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/run-ptest new file +6 -0
new file mode 100644
index 0000000..770a62e
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+#This script is used to run elfutils test suites
+cd tests
+
+make -k runtest-TESTS abs_srcdir=$PWD abs_builddir=$PWD bindir=$PWD/../src/  srcdir=$PWD  top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed
meta/recipes-devtools/elfutils/files/serial-tests.patch new file +28 -0
new file mode 100644
index 0000000..4b448cd
@@ -0,0 +1,28 @@
+From 48e111a17e8d5f10690716a63c17670f1406b56c Mon Sep 17 00:00:00 2001
+From: "Hongjun.Yang" <[email protected]>
+Date: Wed, 28 Oct 2015 13:24:54 +0800
+Subject: [PATCH] Add serial-tests support, ptest need it.
+
+Add serial-tests support, ptest need it.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b4e012d..2eb0417 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,7 +45,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2018 The elfutils developers.])
+ AC_PREREQ(2.63)			dnl Minimum Autoconf version required.
+ 
+ dnl We use GNU make extensions; automake 1.10 defaults to -Wportability.
+-AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip parallel-tests])
++AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip serial-tests])
+ AM_MAINTAINER_MODE
+ 
+ AM_SILENT_RULES([yes])
Signature · 1 line
2.7.4
#1 lore raw
Quoted 11 lines · On Fri, 2019-04-12 at 17:21 +0800, [email protected] wrote:

From: Mingli Yu <[email protected]>

Add testsuite-ignore-elflint.diff from debian
(
http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz
)
to fix below ptest failure:
| ./run-strip-strmerge.sh: line 33: testrun_on_self_skip: command
not found
| FAIL: run-strip-strmerge.sh

Quoted 3 lines

Add check for gcc for two test cases such as
run-strip-nothing.sh and run-strip-g.sh which
depends on gcc at run time.

I'm afraid this doesn't work on musl:

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/510

Cheers,

Richard

#2 lore raw

PATCH v2 1/2 elfutils: add ptest support

From: Mingli Yu <[email protected]>

Add testsuite-ignore-elflint.diff from debian
(http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz)
to fix below ptest failure:
| ./run-strip-strmerge.sh: line 33: testrun_on_self_skip: command not found | FAIL: run-strip-strmerge.sh

Add check for gcc for two test cases such as
run-strip-nothing.sh and run-strip-g.sh which
depends on gcc at run time.

---
 meta/recipes-devtools/elfutils/elfutils_0.176.bb   | 27 ++++++++++-
 .../0001-skip-the-test-when-gcc-not-deployed.patch | 45 +++++++++++++++++++
 .../files/debian/testsuite-ignore-elflint.diff     | 52 ++++++++++++++++++++++
 meta/recipes-devtools/elfutils/files/run-ptest     |  6 +++
 .../elfutils/files/serial-tests.patch              | 28 ++++++++++++
 5 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch
 create mode 100644 meta/recipes-devtools/elfutils/files/debian/testsuite-ignore-elflint.diff
 create mode 100644 meta/recipes-devtools/elfutils/files/run-ptest
 create mode 100644 meta/recipes-devtools/elfutils/files/serial-tests.patch
meta/recipes-devtools/elfutils/elfutils_0.176.bb +26 -1
index fd901c9..917c296 100644
@@ -27,16 +27,24 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://debian/hurd_path.patch \
            file://debian/ignore_strmerge.diff \
            file://debian/disable_werror.patch \
+           file://debian/testsuite-ignore-elflint.diff \
+           file://0001-skip-the-test-when-gcc-not-deployed.patch \
+           file://run-ptest \
+           file://serial-tests.patch \
            "
 SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
 
 SRC_URI[md5sum] = "077e4f49320cad82bf17a997068b1db9"
 SRC_URI[sha256sum] = "eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023"
 
-inherit autotools gettext
+inherit autotools gettext ptest
 
 EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
 EXTRA_OECONF_append_class-native = " --without-bzlib"
+# gcc has been added to blacklist, we will find workaround solution
+RDEPENDS_${PN}-ptest = "libasm libelf bash"
+
+EXTRA_OECONF_append_class-target += "--enable-tests-rpath"
 
 do_install_append() {
 	if [ "${TARGET_ARCH}" != "x86_64" ] && [ -z `echo "${TARGET_ARCH}"|grep 'i.86'` ];then
@@ -44,6 +52,23 @@ do_install_append() {
 	fi
 }
 
+do_compile_ptest() {
+	cd ${B}/tests
+	oe_runmake buildtest-TESTS
+}
+
+do_install_ptest() {
+	if [ ${PTEST_ENABLED} = "1" ]; then
+		cp -r ${S}/tests/                       ${D}${PTEST_PATH}
+		cp -r ${B}/tests/*                      ${D}${PTEST_PATH}/tests
+		cp -r ${B}/src                          ${D}${PTEST_PATH}
+		cp -r ${B}/config.h                     ${D}${PTEST_PATH}
+		cp -r ${B}/backends                     ${D}${PTEST_PATH}
+		sed -i '/^Makefile:/c Makefile:'        ${D}${PTEST_PATH}/tests/Makefile
+		find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {}
+	fi
+}
+
 EXTRA_OEMAKE_class-native = ""
 EXTRA_OEMAKE_class-nativesdk = ""
 
meta/recipes-devtools/elfutils/files/0001-skip-the-test-when-gcc-not-deployed.patch new file +45 -0

45 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/debian/testsuite-ignore-elflint.diff new file +52 -0

52 lines not on this page · raw message

meta/recipes-devtools/elfutils/files/run-ptest new file +6 -0
new file mode 100644
index 0000000..770a62e
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+#This script is used to run elfutils test suites
+cd tests
+
+make -k runtest-TESTS abs_srcdir=$PWD abs_builddir=$PWD bindir=$PWD/../src/  srcdir=$PWD  top_srcdir=$PWD/../ abs_top_builddir=$PWD/../ elfutils_testrun=installed
meta/recipes-devtools/elfutils/files/serial-tests.patch new file +28 -0
new file mode 100644
index 0000000..4b448cd
@@ -0,0 +1,28 @@
+From 48e111a17e8d5f10690716a63c17670f1406b56c Mon Sep 17 00:00:00 2001
+From: "Hongjun.Yang" <[email protected]>
+Date: Wed, 28 Oct 2015 13:24:54 +0800
+Subject: [PATCH] Add serial-tests support, ptest need it.
+
+Add serial-tests support, ptest need it.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <[email protected]>
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b4e012d..2eb0417 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,7 +45,7 @@ AC_COPYRIGHT([Copyright (C) 1996-2018 The elfutils developers.])
+ AC_PREREQ(2.63)			dnl Minimum Autoconf version required.
+ 
+ dnl We use GNU make extensions; automake 1.10 defaults to -Wportability.
+-AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip parallel-tests])
++AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip serial-tests])
+ AM_MAINTAINER_MODE
+ 
+ AM_SILENT_RULES([yes])
Signature · 1 line
2.7.4
#3 lore raw

PATCH v2 2/2 elfutils: fix build failure with musl

From: Mingli Yu <[email protected]>

Fix below build failure with musl when ptest
enabled.

| In file included from ../../elfutils-0.176/tests/dwfl-proc-attach.c:33:
| ../../elfutils-0.176/lib/system.h:63:35: error: called object 'err' is not a function or function pointer
|  #define error(status, errno, ...) err(status, __VA_ARGS__)
|                                    ^~~
| ../../elfutils-0.176/tests/dwfl-proc-attach.c:92:5: note: in expansion of macro 'error'
|      error (-1, 0, "dwfl_linux_proc_attach pid %d: %s", pid,
|      ^~~~~
| ../../elfutils-0.176/tests/dwfl-proc-attach.c:79:7: note: declared here
|    int err;
|        ^~~

The root cause is because the conflicts between vairable and function name, so change the variable name to workaround it.

---
 meta/recipes-devtools/elfutils/elfutils_0.176.bb   |  4 +-
 ...1-fix-err-variable-and-function-conflicts.patch | 62 ++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/elfutils/files/0001-fix-err-variable-and-function-conflicts.patch
meta/recipes-devtools/elfutils/elfutils_0.176.bb +3 -1
index 917c296..ae3d961 100644
@@ -32,7 +32,9 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
            file://run-ptest \
            file://serial-tests.patch \
            "
-SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
+SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch \
+                             file://0001-fix-err-variable-and-function-conflicts.patch \
+"
 
 SRC_URI[md5sum] = "077e4f49320cad82bf17a997068b1db9"
 SRC_URI[sha256sum] = "eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023"
meta/recipes-devtools/elfutils/files/0001-fix-err-variable-and-function-conflicts.patch new file +62 -0

62 lines not on this page · raw message

Signature · 1 line
2.7.4