diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-04-23 17:43:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-25 00:05:20 +0100 |
commit | 0ab0dacc1afe3453f74b0bbc8b15229f93f1c61f (patch) | |
tree | 25b41bf352de76dce008ea4174d020366792d7ff /meta/recipes-devtools/m4/m4 | |
parent | 3772725a45bc749340530fc8dd4d674a7ca79654 (diff) | |
download | poky-0ab0dacc1afe3453f74b0bbc8b15229f93f1c61f.tar.gz |
m4: add ptest support
add patch 0001-test-getopt-posix-fix.patch for fix test-getopt-posix
(From OE-Core rev: 6048f6787b0b6e98f8d16710ffb68fe10c41e0a2)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/m4/m4')
-rw-r--r-- | meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch | 41 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/run-ptest | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/serial-tests-config.patch | 30 |
3 files changed, 76 insertions, 0 deletions
diff --git a/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch b/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch new file mode 100644 index 0000000000..11508ee0e2 --- /dev/null +++ b/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 75bea7c72a919859674f493548653de88f96c798 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 22 Apr 2019 10:36:13 +0800 | ||
4 | Subject: [PATCH] test-getopt-posix fix | ||
5 | |||
6 | fix below problem: | ||
7 | test-getopt.h:754: assertion 'strcmp (argv[1], "donald") == 0' failed | ||
8 | |||
9 | get this patch from | ||
10 | https://github.com/habitat-sh/core-plans/blob/master/m4/fix-test-getopt-posix-with-glibc-2.26.patch | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | have report this bug to m4-discuss@gnu.org | ||
15 | |||
16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
17 | --- | ||
18 | tests/test-getopt-posix.c | 7 +++++++ | ||
19 | 1 file changed, 7 insertions(+) | ||
20 | |||
21 | diff --git a/tests/test-getopt-posix.c b/tests/test-getopt-posix.c | ||
22 | index 5532271..2a3d511 100644 | ||
23 | --- a/tests/test-getopt-posix.c | ||
24 | +++ b/tests/test-getopt-posix.c | ||
25 | @@ -22,6 +22,13 @@ | ||
26 | ftell link warning if we are not using the gnulib ftell module. */ | ||
27 | #define _GL_NO_LARGE_FILES | ||
28 | |||
29 | +/* | ||
30 | + * Glibc 2.26 does hard include bits/getopt_posix.h which causes the system | ||
31 | + * to use glibc's getopt but the tests expect gnulib behavior. Until a better | ||
32 | + * fix is available this avoids that mis-resolution. | ||
33 | + */ | ||
34 | +#include <getopt.h> | ||
35 | + | ||
36 | /* POSIX and glibc provide the getopt() function in <unistd.h>, see | ||
37 | http://pubs.opengroup.org/onlinepubs/9699919799/functions/getopt.html | ||
38 | https://www.gnu.org/software/libc/manual/html_node/Using-Getopt.html | ||
39 | -- | ||
40 | 2.7.4 | ||
41 | |||
diff --git a/meta/recipes-devtools/m4/m4/run-ptest b/meta/recipes-devtools/m4/m4/run-ptest new file mode 100644 index 0000000000..5c0fe93357 --- /dev/null +++ b/meta/recipes-devtools/m4/m4/run-ptest | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | #This script is used to run m4 test suites | ||
4 | cd tests | ||
5 | make -k runtest-TESTS top_srcdir=.. srcdir=. | ||
diff --git a/meta/recipes-devtools/m4/m4/serial-tests-config.patch b/meta/recipes-devtools/m4/m4/serial-tests-config.patch new file mode 100644 index 0000000000..34e6ad801e --- /dev/null +++ b/meta/recipes-devtools/m4/m4/serial-tests-config.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From ab8491111b4578db5b735c6466187775e1855f18 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 23 Apr 2019 15:35:00 +0800 | ||
4 | Subject: [PATCH] add a patch to use serial-tests config needed by ptest | ||
5 | |||
6 | Add serial-tests support, ptest need it. | ||
7 | |||
8 | Upstream-Status: Inappropriate [oe specific] | ||
9 | |||
10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
11 | --- | ||
12 | configure.ac | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 78b8788..931fa6f 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -22,7 +22,7 @@ AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .tarball-version]), | ||
20 | [bug-m4@gnu.org]) | ||
21 | AC_CONFIG_AUX_DIR([build-aux]) | ||
22 | |||
23 | -AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests parallel-tests | ||
24 | +AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests serial-tests | ||
25 | silent-rules subdir-objects gnu]) | ||
26 | AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. | ||
27 | |||
28 | -- | ||
29 | 2.7.4 | ||
30 | |||