* [PATCH] ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
@ 2013-12-07 17:49 Martin Jansa
2013-12-10 15:41 ` Saul Wold
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-12-07 17:49 UTC (permalink / raw)
To: openembedded-core
* 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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/distro/include/default-providers.inc | 2 ++
...tests_noltp.sh-script-so-have-unique-name.patch | 38 ++++++++++++++++++++++
meta/recipes-extended/ltp/ltp_20130904.bb | 4 ++-
3 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index d4b9db0..e2b0892 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
# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
# on this rather strange entry.
PREFERRED_PROVIDER_bluez4 ?= "bluez4"
+# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
+PREFERRED_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 0000000..74abe56
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
@@ -0,0 +1,38 @@
+From 9751a6526cffcdf4e3dc2cb33641259a7be00e19 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 7 Dec 2013 18:24:32 +0100
+Subject: [PATCH] Rename runtests_noltp.sh script so have unique name
+
+* they are installed in the same target path
+ /opt/ltp/testcases/bin/runtests_noltp.sh
+ and overwrite each other in non-deterministic way
+ when multiple processes are used in "make install"
+
+ ./temp/log.do_install:install -m 00775
+ "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/sysvipc/runtests_noltp.sh"
+ "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
+ ./temp/log.do_install:install -m 00775
+ "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/utsname/runtests_noltp.sh"
+ "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ .../kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} | 0
+ .../kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename testcases/kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} (100%)
+ rename testcases/kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} (100%)
+
+diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+similarity index 100%
+rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh
+rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
+similarity index 100%
+rename from testcases/kernel/containers/utsname/runtests_noltp.sh
+rename to testcases/kernel/containers/utsname/runutstests_noltp.sh
+--
+1.8.4.3
+
diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb
index 5e10448..4722a38 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 \
DEPENDS = "attr libaio libcap acl openssl"
-SRC_URI = "git://github.com/linux-test-project/ltp.git"
+SRC_URI = "git://github.com/linux-test-project/ltp.git \
+ file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
+"
SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5"
S = "${WORKDIR}/git"
--
1.8.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
2013-12-07 17:49 [PATCH] ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script Martin Jansa
@ 2013-12-10 15:41 ` Saul Wold
2013-12-10 16:19 ` Martin Jansa
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Saul Wold @ 2013-12-10 15:41 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 12/07/2013 09:49 AM, Martin Jansa wrote:
> * 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
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/conf/distro/include/default-providers.inc | 2 ++
> ...tests_noltp.sh-script-so-have-unique-name.patch | 38 ++++++++++++++++++++++
> meta/recipes-extended/ltp/ltp_20130904.bb | 4 ++-
> 3 files changed, 43 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
>
This patch does not appear to apply correctly, I drop into patch resolution:
*** Manual patch resolution mode ***
Dropping to a shell, so patch rejects can be fixed manually.
Run "quilt refresh" when patch is corrected, press CTRL+D to exit.
Applying patch
0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
patch: **** Only garbage was found in the patch input.
Patch 0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
does not apply (enforce with -f)
Can you verify this is correct.
Thanks
Sau!
> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> index d4b9db0..e2b0892 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
> # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
> # on this rather strange entry.
> PREFERRED_PROVIDER_bluez4 ?= "bluez4"
> +# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
> +PREFERRED_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 0000000..74abe56
> --- /dev/null
> +++ b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
> @@ -0,0 +1,38 @@
> +From 9751a6526cffcdf4e3dc2cb33641259a7be00e19 Mon Sep 17 00:00:00 2001
> +From: Martin Jansa <Martin.Jansa@gmail.com>
> +Date: Sat, 7 Dec 2013 18:24:32 +0100
> +Subject: [PATCH] Rename runtests_noltp.sh script so have unique name
> +
> +* they are installed in the same target path
> + /opt/ltp/testcases/bin/runtests_noltp.sh
> + and overwrite each other in non-deterministic way
> + when multiple processes are used in "make install"
> +
> + ./temp/log.do_install:install -m 00775
> + "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/sysvipc/runtests_noltp.sh"
> + "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
> + ./temp/log.do_install:install -m 00775
> + "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/utsname/runtests_noltp.sh"
> + "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> +---
> + .../kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} | 0
> + .../kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} | 0
> + 2 files changed, 0 insertions(+), 0 deletions(-)
> + rename testcases/kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} (100%)
> + rename testcases/kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} (100%)
> +
> +diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
> +similarity index 100%
> +rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh
> +rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh
> +diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
> +similarity index 100%
> +rename from testcases/kernel/containers/utsname/runtests_noltp.sh
> +rename to testcases/kernel/containers/utsname/runutstests_noltp.sh
> +--
> +1.8.4.3
> +
> diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb
> index 5e10448..4722a38 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 \
>
> DEPENDS = "attr libaio libcap acl openssl"
>
> -SRC_URI = "git://github.com/linux-test-project/ltp.git"
> +SRC_URI = "git://github.com/linux-test-project/ltp.git \
> + file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
> +"
>
> SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5"
> S = "${WORKDIR}/git"
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
2013-12-10 15:41 ` Saul Wold
@ 2013-12-10 16:19 ` Martin Jansa
2013-12-10 16:44 ` [PATCHv2] " Martin Jansa
2013-12-13 2:37 ` [PATCH] ltp: Use patch generated without -M Martin Jansa
2 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-12-10 16:19 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 5939 bytes --]
On Tue, Dec 10, 2013 at 07:41:22AM -0800, Saul Wold wrote:
> On 12/07/2013 09:49 AM, Martin Jansa wrote:
> > * 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
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/conf/distro/include/default-providers.inc | 2 ++
> > ...tests_noltp.sh-script-so-have-unique-name.patch | 38 ++++++++++++++++++++++
> > meta/recipes-extended/ltp/ltp_20130904.bb | 4 ++-
> > 3 files changed, 43 insertions(+), 1 deletion(-)
> > create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
> >
> This patch does not appear to apply correctly, I drop into patch resolution:
>
>
> *** Manual patch resolution mode ***
> Dropping to a shell, so patch rejects can be fixed manually.
> Run "quilt refresh" when patch is corrected, press CTRL+D to exit.
>
> Applying patch
> 0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
> patch: **** Only garbage was found in the patch input.
> Patch 0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
> does not apply (enforce with -f)
>
> Can you verify this is correct.
I'll send v2 with patch which wasn't created with -M.
I have tested both versions and both work here, but maybe you're using
different PATCHTOOL (well my bitbake -e also shows PATCHTOOL="quilt",
maybe PATCHRESOLVE = "noop" causes different behavior here).
> > diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> > index d4b9db0..e2b0892 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
> > # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
> > # on this rather strange entry.
> > PREFERRED_PROVIDER_bluez4 ?= "bluez4"
> > +# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
> > +PREFERRED_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 0000000..74abe56
> > --- /dev/null
> > +++ b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
> > @@ -0,0 +1,38 @@
> > +From 9751a6526cffcdf4e3dc2cb33641259a7be00e19 Mon Sep 17 00:00:00 2001
> > +From: Martin Jansa <Martin.Jansa@gmail.com>
> > +Date: Sat, 7 Dec 2013 18:24:32 +0100
> > +Subject: [PATCH] Rename runtests_noltp.sh script so have unique name
> > +
> > +* they are installed in the same target path
> > + /opt/ltp/testcases/bin/runtests_noltp.sh
> > + and overwrite each other in non-deterministic way
> > + when multiple processes are used in "make install"
> > +
> > + ./temp/log.do_install:install -m 00775
> > + "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/sysvipc/runtests_noltp.sh"
> > + "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
> > + ./temp/log.do_install:install -m 00775
> > + "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/utsname/runtests_noltp.sh"
> > + "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
> > +
> > +Upstream-Status: Pending
> > +
> > +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > +---
> > + .../kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} | 0
> > + .../kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} | 0
> > + 2 files changed, 0 insertions(+), 0 deletions(-)
> > + rename testcases/kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} (100%)
> > + rename testcases/kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} (100%)
> > +
> > +diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
> > +similarity index 100%
> > +rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh
> > +rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh
> > +diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
> > +similarity index 100%
> > +rename from testcases/kernel/containers/utsname/runtests_noltp.sh
> > +rename to testcases/kernel/containers/utsname/runutstests_noltp.sh
> > +--
> > +1.8.4.3
> > +
> > diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb
> > index 5e10448..4722a38 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 \
> >
> > DEPENDS = "attr libaio libcap acl openssl"
> >
> > -SRC_URI = "git://github.com/linux-test-project/ltp.git"
> > +SRC_URI = "git://github.com/linux-test-project/ltp.git \
> > + file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
> > +"
> >
> > SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5"
> > S = "${WORKDIR}/git"
> >
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCHv2] ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script
2013-12-10 15:41 ` Saul Wold
2013-12-10 16:19 ` Martin Jansa
@ 2013-12-10 16:44 ` Martin Jansa
2013-12-13 2:37 ` [PATCH] ltp: Use patch generated without -M Martin Jansa
2 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-12-10 16:44 UTC (permalink / raw)
To: openembedded-core
* 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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/distro/include/default-providers.inc | 2 +
...tests_noltp.sh-script-so-have-unique-name.patch | 202 +++++++++++++++++++++
meta/recipes-extended/ltp/ltp_20130904.bb | 4 +-
3 files changed, 207 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index d4b9db0..e2b0892 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
# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
# on this rather strange entry.
PREFERRED_PROVIDER_bluez4 ?= "bluez4"
+# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
+PREFERRED_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 0000000..1b4d232
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
@@ -0,0 +1,202 @@
+From 9751a6526cffcdf4e3dc2cb33641259a7be00e19 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 7 Dec 2013 18:24:32 +0100
+Subject: [PATCH] Rename runtests_noltp.sh script so have unique name
+
+* they are installed in the same target path
+ /opt/ltp/testcases/bin/runtests_noltp.sh
+ and overwrite each other in non-deterministic way
+ when multiple processes are used in "make install"
+
+ ./temp/log.do_install:install -m 00775
+ "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/sysvipc/runtests_noltp.sh"
+ "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
+ ./temp/log.do_install:install -m 00775
+ "ltp/20120903-r2/ltp-20120903/testcases/kernel/containers/utsname/runtests_noltp.sh"
+ "ltp/20120903-r2/image/opt/ltp/testcases/bin/runtests_noltp.sh"
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ .../kernel/containers/sysvipc/runipctests_noltp.sh | 31 ++++++++++++++++
+ .../kernel/containers/sysvipc/runtests_noltp.sh | 31 ----------------
+ .../kernel/containers/utsname/runtests_noltp.sh | 41 ----------------------
+ .../kernel/containers/utsname/runutstests_noltp.sh | 41 ++++++++++++++++++++++
+ 4 files changed, 72 insertions(+), 72 deletions(-)
+ create mode 100644 testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+ delete mode 100644 testcases/kernel/containers/sysvipc/runtests_noltp.sh
+ delete mode 100755 testcases/kernel/containers/utsname/runtests_noltp.sh
+ create mode 100755 testcases/kernel/containers/utsname/runutstests_noltp.sh
+
+diff --git a/testcases/kernel/containers/sysvipc/runipctests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+new file mode 100644
+index 0000000..84f398f
+--- /dev/null
++++ b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++################################################################################
++## ##
++## Copyright (c) International Business Machines Corp., 2007 ##
++## ##
++## This program is free software; you can redistribute it and#or modify ##
++## it under the terms of the GNU General Public License as published by ##
++## the Free Software Foundation; either version 2 of the License, or ##
++## (at your option) any later version. ##
++## ##
++## This program is distributed in the hope that it will be useful, but ##
++## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
++## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
++## for more details. ##
++## ##
++## You should have received a copy of the GNU General Public License ##
++## along with this program; if not, write to the Free Software ##
++## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
++## ##
++################################################################################
++
++exit_code=0
++echo "sysvipc tests"
++for type in none clone unshare; do
++ echo "**sysvipc $type"
++ ./shmnstest_noltp $type
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++exit $exit_code
+diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runtests_noltp.sh
+deleted file mode 100644
+index 84f398f..0000000
+--- a/testcases/kernel/containers/sysvipc/runtests_noltp.sh
++++ /dev/null
+@@ -1,31 +0,0 @@
+-#!/bin/sh
+-################################################################################
+-## ##
+-## Copyright (c) International Business Machines Corp., 2007 ##
+-## ##
+-## This program is free software; you can redistribute it and#or modify ##
+-## it under the terms of the GNU General Public License as published by ##
+-## the Free Software Foundation; either version 2 of the License, or ##
+-## (at your option) any later version. ##
+-## ##
+-## This program is distributed in the hope that it will be useful, but ##
+-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
+-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
+-## for more details. ##
+-## ##
+-## You should have received a copy of the GNU General Public License ##
+-## along with this program; if not, write to the Free Software ##
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
+-## ##
+-################################################################################
+-
+-exit_code=0
+-echo "sysvipc tests"
+-for type in none clone unshare; do
+- echo "**sysvipc $type"
+- ./shmnstest_noltp $type
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-exit $exit_code
+diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runtests_noltp.sh
+deleted file mode 100755
+index 43cb7e2..0000000
+--- a/testcases/kernel/containers/utsname/runtests_noltp.sh
++++ /dev/null
+@@ -1,41 +0,0 @@
+-#!/bin/sh
+-################################################################################
+-## ##
+-## Copyright (c) International Business Machines Corp., 2007 ##
+-## ##
+-## This program is free software; you can redistribute it and#or modify ##
+-## it under the terms of the GNU General Public License as published by ##
+-## the Free Software Foundation; either version 2 of the License, or ##
+-## (at your option) any later version. ##
+-## ##
+-## This program is distributed in the hope that it will be useful, but ##
+-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
+-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
+-## for more details. ##
+-## ##
+-## You should have received a copy of the GNU General Public License ##
+-## along with this program; if not, write to the Free Software ##
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
+-## ##
+-################################################################################
+-
+-oldhostname=`hostname`
+-exit_code=0
+-echo "unshare tests"
+-for i in `seq 1 5`; do
+- echo "test $i (unshare)"
+- ./utstest_noltp unshare $i
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-echo "clone tests"
+-for i in `seq 1 5`; do
+- echo "test $i (clone)"
+- ./utstest_noltp clone $i
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-hostname "$oldhostname"
+-exit $exit_code
+diff --git a/testcases/kernel/containers/utsname/runutstests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
+new file mode 100755
+index 0000000..43cb7e2
+--- /dev/null
++++ b/testcases/kernel/containers/utsname/runutstests_noltp.sh
+@@ -0,0 +1,41 @@
++#!/bin/sh
++################################################################################
++## ##
++## Copyright (c) International Business Machines Corp., 2007 ##
++## ##
++## This program is free software; you can redistribute it and#or modify ##
++## it under the terms of the GNU General Public License as published by ##
++## the Free Software Foundation; either version 2 of the License, or ##
++## (at your option) any later version. ##
++## ##
++## This program is distributed in the hope that it will be useful, but ##
++## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
++## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
++## for more details. ##
++## ##
++## You should have received a copy of the GNU General Public License ##
++## along with this program; if not, write to the Free Software ##
++## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
++## ##
++################################################################################
++
++oldhostname=`hostname`
++exit_code=0
++echo "unshare tests"
++for i in `seq 1 5`; do
++ echo "test $i (unshare)"
++ ./utstest_noltp unshare $i
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++echo "clone tests"
++for i in `seq 1 5`; do
++ echo "test $i (clone)"
++ ./utstest_noltp clone $i
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++hostname "$oldhostname"
++exit $exit_code
+--
+1.8.4.3
+
diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb
index 5e10448..4722a38 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 \
DEPENDS = "attr libaio libcap acl openssl"
-SRC_URI = "git://github.com/linux-test-project/ltp.git"
+SRC_URI = "git://github.com/linux-test-project/ltp.git \
+ file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
+"
SRCREV = "a8c42db5f9314211811c36275a21f83902830dc5"
S = "${WORKDIR}/git"
--
1.8.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ltp: Use patch generated without -M
2013-12-10 15:41 ` Saul Wold
2013-12-10 16:19 ` Martin Jansa
2013-12-10 16:44 ` [PATCHv2] " Martin Jansa
@ 2013-12-13 2:37 ` Martin Jansa
2013-12-13 12:09 ` Martin Jansa
2 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-12-13 2:37 UTC (permalink / raw)
To: openembedded-core
* in my builds both versions worked, but Saul reported that it fails to
apply with:
Applying patch
0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
patch: **** Only garbage was found in the patch input.
Now I've see the same issue on different builder (with Ubuntu 12.04).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...tests_noltp.sh-script-so-have-unique-name.patch | 190 +++++++++++++++++++--
1 file changed, 177 insertions(+), 13 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
index 74abe56..1b4d232 100644
--- 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
@@ -19,20 +19,184 @@ Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- .../kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} | 0
- .../kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename testcases/kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} (100%)
- rename testcases/kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} (100%)
+ .../kernel/containers/sysvipc/runipctests_noltp.sh | 31 ++++++++++++++++
+ .../kernel/containers/sysvipc/runtests_noltp.sh | 31 ----------------
+ .../kernel/containers/utsname/runtests_noltp.sh | 41 ----------------------
+ .../kernel/containers/utsname/runutstests_noltp.sh | 41 ++++++++++++++++++++++
+ 4 files changed, 72 insertions(+), 72 deletions(-)
+ create mode 100644 testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+ delete mode 100644 testcases/kernel/containers/sysvipc/runtests_noltp.sh
+ delete mode 100755 testcases/kernel/containers/utsname/runtests_noltp.sh
+ create mode 100755 testcases/kernel/containers/utsname/runutstests_noltp.sh
-diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
-similarity index 100%
-rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh
-rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh
-diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
-similarity index 100%
-rename from testcases/kernel/containers/utsname/runtests_noltp.sh
-rename to testcases/kernel/containers/utsname/runutstests_noltp.sh
+diff --git a/testcases/kernel/containers/sysvipc/runipctests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+new file mode 100644
+index 0000000..84f398f
+--- /dev/null
++++ b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++################################################################################
++## ##
++## Copyright (c) International Business Machines Corp., 2007 ##
++## ##
++## This program is free software; you can redistribute it and#or modify ##
++## it under the terms of the GNU General Public License as published by ##
++## the Free Software Foundation; either version 2 of the License, or ##
++## (at your option) any later version. ##
++## ##
++## This program is distributed in the hope that it will be useful, but ##
++## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
++## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
++## for more details. ##
++## ##
++## You should have received a copy of the GNU General Public License ##
++## along with this program; if not, write to the Free Software ##
++## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
++## ##
++################################################################################
++
++exit_code=0
++echo "sysvipc tests"
++for type in none clone unshare; do
++ echo "**sysvipc $type"
++ ./shmnstest_noltp $type
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++exit $exit_code
+diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runtests_noltp.sh
+deleted file mode 100644
+index 84f398f..0000000
+--- a/testcases/kernel/containers/sysvipc/runtests_noltp.sh
++++ /dev/null
+@@ -1,31 +0,0 @@
+-#!/bin/sh
+-################################################################################
+-## ##
+-## Copyright (c) International Business Machines Corp., 2007 ##
+-## ##
+-## This program is free software; you can redistribute it and#or modify ##
+-## it under the terms of the GNU General Public License as published by ##
+-## the Free Software Foundation; either version 2 of the License, or ##
+-## (at your option) any later version. ##
+-## ##
+-## This program is distributed in the hope that it will be useful, but ##
+-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
+-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
+-## for more details. ##
+-## ##
+-## You should have received a copy of the GNU General Public License ##
+-## along with this program; if not, write to the Free Software ##
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
+-## ##
+-################################################################################
+-
+-exit_code=0
+-echo "sysvipc tests"
+-for type in none clone unshare; do
+- echo "**sysvipc $type"
+- ./shmnstest_noltp $type
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-exit $exit_code
+diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runtests_noltp.sh
+deleted file mode 100755
+index 43cb7e2..0000000
+--- a/testcases/kernel/containers/utsname/runtests_noltp.sh
++++ /dev/null
+@@ -1,41 +0,0 @@
+-#!/bin/sh
+-################################################################################
+-## ##
+-## Copyright (c) International Business Machines Corp., 2007 ##
+-## ##
+-## This program is free software; you can redistribute it and#or modify ##
+-## it under the terms of the GNU General Public License as published by ##
+-## the Free Software Foundation; either version 2 of the License, or ##
+-## (at your option) any later version. ##
+-## ##
+-## This program is distributed in the hope that it will be useful, but ##
+-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
+-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
+-## for more details. ##
+-## ##
+-## You should have received a copy of the GNU General Public License ##
+-## along with this program; if not, write to the Free Software ##
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
+-## ##
+-################################################################################
+-
+-oldhostname=`hostname`
+-exit_code=0
+-echo "unshare tests"
+-for i in `seq 1 5`; do
+- echo "test $i (unshare)"
+- ./utstest_noltp unshare $i
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-echo "clone tests"
+-for i in `seq 1 5`; do
+- echo "test $i (clone)"
+- ./utstest_noltp clone $i
+- if [ $? -ne 0 ]; then
+- exit_code=$?
+- fi
+-done
+-hostname "$oldhostname"
+-exit $exit_code
+diff --git a/testcases/kernel/containers/utsname/runutstests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh
+new file mode 100755
+index 0000000..43cb7e2
+--- /dev/null
++++ b/testcases/kernel/containers/utsname/runutstests_noltp.sh
+@@ -0,0 +1,41 @@
++#!/bin/sh
++################################################################################
++## ##
++## Copyright (c) International Business Machines Corp., 2007 ##
++## ##
++## This program is free software; you can redistribute it and#or modify ##
++## it under the terms of the GNU General Public License as published by ##
++## the Free Software Foundation; either version 2 of the License, or ##
++## (at your option) any later version. ##
++## ##
++## This program is distributed in the hope that it will be useful, but ##
++## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
++## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
++## for more details. ##
++## ##
++## You should have received a copy of the GNU General Public License ##
++## along with this program; if not, write to the Free Software ##
++## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
++## ##
++################################################################################
++
++oldhostname=`hostname`
++exit_code=0
++echo "unshare tests"
++for i in `seq 1 5`; do
++ echo "test $i (unshare)"
++ ./utstest_noltp unshare $i
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++echo "clone tests"
++for i in `seq 1 5`; do
++ echo "test $i (clone)"
++ ./utstest_noltp clone $i
++ if [ $? -ne 0 ]; then
++ exit_code=$?
++ fi
++done
++hostname "$oldhostname"
++exit $exit_code
--
1.8.4.3
--
1.8.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ltp: Use patch generated without -M
2013-12-13 2:37 ` [PATCH] ltp: Use patch generated without -M Martin Jansa
@ 2013-12-13 12:09 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-12-13 12:09 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]
On Fri, Dec 13, 2013 at 03:37:18AM +0100, Martin Jansa wrote:
> * in my builds both versions worked, but Saul reported that it fails to
> apply with:
> Applying patch
> 0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
> patch: **** Only garbage was found in the patch input.
>
> Now I've see the same issue on different builder (with Ubuntu 12.04).
The difference is version of patch utility:
gentoo:
ltp/20130904-r0/git $ patch -v
GNU patch 2.7.1
...
ltp/20130904-r0/git $ patch -p1 < ../0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
patching file testcases/kernel/containers/sysvipc/runipctests_noltp.sh (renamed from testcases/kernel/containers/sysvipc/runtests_noltp.sh)
patching file testcases/kernel/containers/utsname/runutstests_noltp.sh (renamed from testcases/kernel/containers/utsname/runtests_noltp.sh)
ubuntu 12.04:
ltp/20130904-r0/git$ patch -v
patch 2.6.1
...
ltp/20130904-r0/git$ patch -p1 <
../0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
patch: **** Only garbage was found in the patch input.
patch-native is in ASSUME_PROVIDED, I guess that quilt-native just calls
patch internally so have the same "problem"
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-13 12:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-07 17:49 [PATCH] ltp: set PREFERRED_PROVIDER and rename runtests_noltp.sh script Martin Jansa
2013-12-10 15:41 ` Saul Wold
2013-12-10 16:19 ` Martin Jansa
2013-12-10 16:44 ` [PATCHv2] " Martin Jansa
2013-12-13 2:37 ` [PATCH] ltp: Use patch generated without -M Martin Jansa
2013-12-13 12:09 ` Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox