diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-12-07 18:49:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-10 17:42:43 +0000 |
commit | 4848a52e890be757e0012c5de148e5fec0e057bc (patch) | |
tree | 72f69f7af26cd23efa88cd4364c39f20496bc99f /meta/recipes-extended/ltp | |
parent | 209eba7067a93ed7fc87c6810a710c2b1b9a031d (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-extended/ltp')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch | 38 | ||||
-rw-r--r-- | meta/recipes-extended/ltp/ltp_20130904.bb | 4 |
2 files changed, 41 insertions, 1 deletions
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 @@ | |||
1 | From 9751a6526cffcdf4e3dc2cb33641259a7be00e19 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 7 Dec 2013 18:24:32 +0100 | ||
4 | Subject: [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 | |||
18 | Upstream-Status: Pending | ||
19 | |||
20 | Signed-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 | |||
28 | diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh | ||
29 | similarity index 100% | ||
30 | rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh | ||
31 | rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh | ||
32 | diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh | ||
33 | similarity index 100% | ||
34 | rename from testcases/kernel/containers/utsname/runtests_noltp.sh | ||
35 | rename to testcases/kernel/containers/utsname/runutstests_noltp.sh | ||
36 | -- | ||
37 | 1.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 | ||
22 | DEPENDS = "attr libaio libcap acl openssl" | 22 | DEPENDS = "attr libaio libcap acl openssl" |
23 | 23 | ||
24 | SRC_URI = "git://github.com/linux-test-project/ltp.git" | 24 | SRC_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 | ||
26 | SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5" | 28 | SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5" |
27 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |