summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-12-07 18:49:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-10 17:42:43 +0000
commit4848a52e890be757e0012c5de148e5fec0e057bc (patch)
tree72f69f7af26cd23efa88cd4364c39f20496bc99f
parent209eba7067a93ed7fc87c6810a710c2b1b9a031d (diff)
downloadpoky-4848a52e890be757e0012c5de148e5fec0e057bc.tar.gz
ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
* ltp installs 2 different runtests_noltp.sh files from different directories into /opt/ltp/testcases/bin/runtests_noltp.sh last one installed wins and causes unexpected changes in buildhistory's files-in-image.txt report, rename them to have unique name as other ltp scripts have. * also define PREFERRED_PROVIDER to resolve note shown when building with meta-oe layer: NOTE: multiple providers are available for ltp (ltp, ltp-ddt) NOTE: consider defining a PREFERRED_PROVIDER entry to match ltp (From OE-Core rev: ec3bb2c2203b2e8bafc1a631f623f858779e20b7) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/default-providers.inc2
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch38
-rw-r--r--meta/recipes-extended/ltp/ltp_20130904.bb4
3 files changed, 43 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index d4b9db014e..e2b0892fae 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -43,3 +43,5 @@ PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','system
43# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details 43# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
44# on this rather strange entry. 44# on this rather strange entry.
45PREFERRED_PROVIDER_bluez4 ?= "bluez4" 45PREFERRED_PROVIDER_bluez4 ?= "bluez4"
46# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
47PREFERRED_PROVIDER_ltp ?= "ltp"
diff --git a/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
new file mode 100644
index 0000000000..74abe564e1
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
@@ -0,0 +1,38 @@
1From 9751a6526cffcdf4e3dc2cb33641259a7be00e19 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 7 Dec 2013 18:24:32 +0100
4Subject: [PATCH] Rename runtests_noltp.sh script so have unique name
5
6* they are installed in the same target path
7 /opt/ltp/testcases/bin/runtests_noltp.sh
8 and overwrite each other in non-deterministic way
9 when multiple processes are used in "make install"
10
11 ./temp/log.do_install:install -m 00775
12 "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/sysvipc/runtests_noltp.sh"
13 "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
14 ./temp/log.do_install:install -m 00775
15 "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/utsname/runtests_noltp.sh"
16 "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
17
18Upstream-Status: Pending
19
20Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21---
22 .../kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} | 0
23 .../kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} | 0
24 2 files changed, 0 insertions(+), 0 deletions(-)
25 rename testcases/kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} (100%)
26 rename testcases/kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} (100%)
27
28diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
29similarity index 100%
30rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh
31rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh
32diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
33similarity index 100%
34rename from testcases/kernel/containers/utsname/runtests_noltp.sh
35rename to testcases/kernel/containers/utsname/runutstests_noltp.sh
36--
371.8.4.3
38
diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb
index 5e104489b1..4722a38bce 100644
--- a/meta/recipes-extended/ltp/ltp_20130904.bb
+++ b/meta/recipes-extended/ltp/ltp_20130904.bb
@@ -21,7 +21,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
21 21
22DEPENDS = "attr libaio libcap acl openssl" 22DEPENDS = "attr libaio libcap acl openssl"
23 23
24SRC_URI = "git://github.com/linux-test-project/ltp.git" 24SRC_URI = "git://github.com/linux-test-project/ltp.git \
25 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
26"
25 27
26SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5" 28SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5"
27S = "${WORKDIR}/git" 29S = "${WORKDIR}/git"