* [PATCH 1/2] ltp: avoid segmentation fault in netns tests
2016-12-12 5:59 [PATCH 0/2] ltp/posix: backport two patches to fix some tests jackie.huang
@ 2016-12-12 5:59 ` jackie.huang
2016-12-12 5:59 ` [PATCH 2/2] ltp/posix: replace CWD with PWD jackie.huang
1 sibling, 0 replies; 3+ messages in thread
From: jackie.huang @ 2016-12-12 5:59 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
* backport a patch to avoid segmentation
fault in netns tests.
* rename previous patch to have ordered
prefix number.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
...twork-nfsv4-acl-acl1.c-Security-fix-on-s.patch} | 0
...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ++++++++++++++++++++++
meta/recipes-extended/ltp/ltp_20160126.bb | 3 +-
3 files changed, 52 insertions(+), 1 deletion(-)
rename meta/recipes-extended/ltp/ltp/{0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch => 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch} (100%)
create mode 100644 meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
similarity index 100%
rename from meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
rename to meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
diff --git a/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
new file mode 100644
index 0000000..18d1f72
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch
@@ -0,0 +1,50 @@
+From 193ce739b2a5174269a958b00c3a5590de944e0d Mon Sep 17 00:00:00 2001
+From: Huacai Chen <chenhc@lemote.com>
+Date: Thu, 27 Oct 2016 14:45:52 +0800
+Subject: [PATCH] containers/netns_netlink: Avoid segmentation fault
+
+In order to avoid segmentation fault (use NULL as a function pointer),
+this patch modify check_netns() by passing a dummy function pointer to
+do_clone_unshare_test().
+
+Signed-off-by: Huacai Chen <chenhc@lemote.com>
+Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
+
+Upstream-Status: Backport
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ testcases/kernel/containers/netns/netns_helper.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/testcases/kernel/containers/netns/netns_helper.h b/testcases/kernel/containers/netns/netns_helper.h
+index 2a331ae..7df6dcb 100644
+--- a/testcases/kernel/containers/netns/netns_helper.h
++++ b/testcases/kernel/containers/netns/netns_helper.h
+@@ -56,6 +56,12 @@ static void check_iproute(unsigned int spe_ipver)
+ pclose(ipf);
+ }
+
++static int dummy(void *arg)
++{
++ (void) arg;
++ return 0;
++}
++
+ static void check_netns(void)
+ {
+ int pid, status;
+@@ -64,8 +70,8 @@ static void check_netns(void)
+ tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWNS (%d) not supported",
+ CLONE_NEWNS);
+
+- pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS, NULL,
+- NULL);
++ pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS,
++ dummy, NULL);
+ if (pid == -1)
+ tst_brkm(TCONF | TERRNO, NULL,
+ "unshare syscall smoke test failed");
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
index 7ee84e3..841302b 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160126.bb
@@ -62,7 +62,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
file://0034-periodic_output.patch \
file://0035-fix-test_proc_kill-hang.patch \
- file://0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
+ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
+ file://0037-containers-netns_netlink-Avoid-segmentation-fault.patch \
"
S = "${WORKDIR}/git"
--
2.8.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] ltp/posix: replace CWD with PWD
2016-12-12 5:59 [PATCH 0/2] ltp/posix: backport two patches to fix some tests jackie.huang
2016-12-12 5:59 ` [PATCH 1/2] ltp: avoid segmentation fault in netns tests jackie.huang
@ 2016-12-12 5:59 ` jackie.huang
1 sibling, 0 replies; 3+ messages in thread
From: jackie.huang @ 2016-12-12 5:59 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
Backport a patch to replace CWD with PWD to avoid
error messages in test results:
basename: missing operand
Try 'basename --help' for more information.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
...ix-option-group-test-replace-CWD-qith-PWD.patch | 44 ++++++++++++++++++++++
meta/recipes-extended/ltp/ltp_20160126.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644 meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
diff --git a/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch b/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
new file mode 100644
index 0000000..8034152
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch
@@ -0,0 +1,44 @@
+From f356775c400f40e3803d80a7bd295b4265959c45 Mon Sep 17 00:00:00 2001
+From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
+Date: Mon, 29 Feb 2016 14:34:40 +0530
+Subject: [PATCH] run-posix-option-group-test: replace CWD qith PWD
+
+When running LTP Open Posix Testsuite there is lot of messages as:
+
+| Usage: basename FILE [SUFFIX]
+|
+| Strip directory path and .SUFFIX from FILE
+|
+| *******************
+| Testing
+| *******************
+
+This is because there is no $CWD defined in shell and it looks like $PWD
+was intended instead.
+
+Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
+Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
+
+Upstream-Status: Backport
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ testcases/open_posix_testsuite/bin/run-tests.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/open_posix_testsuite/bin/run-tests.sh b/testcases/open_posix_testsuite/bin/run-tests.sh
+index d4bd988..5ee5687 100755
+--- a/testcases/open_posix_testsuite/bin/run-tests.sh
++++ b/testcases/open_posix_testsuite/bin/run-tests.sh
+@@ -29,7 +29,7 @@ run_test_loop() {
+
+ cat <<EOF
+ *******************
+-Testing $(basename $CWD)
++Testing $(basename $PWD)
+ *******************
+ $(printf "PASS\t\t%3d" $NUM_PASS)
+ $(printf "FAIL\t\t%3d" $NUM_FAIL)
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
index 841302b..6e2ceac 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160126.bb
@@ -64,6 +64,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0035-fix-test_proc_kill-hang.patch \
file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
file://0037-containers-netns_netlink-Avoid-segmentation-fault.patch \
+ file://0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch \
"
S = "${WORKDIR}/git"
--
2.8.3
^ permalink raw reply related [flat|nested] 3+ messages in thread