Patchwork [05/15] popt: disable tests

login
register
mail settings
Submitter Marko Lindqvist
Date Jan. 3, 2013, 8:36 p.m.
Message ID <1357245391-11055-6-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/41919/
State New
Headers show

Comments

Marko Lindqvist - Jan. 3, 2013, 8:36 p.m.
Use of $(top_srcdir) in TESTS is an error causing automake-1.13
to abort. Disable the tests completely.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-support/popt/popt/disable_tests.patch |   21 ++++++++++++++++++++
 meta/recipes-support/popt/popt_1.16.bb             |    3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/popt/popt/disable_tests.patch
Ross Burton - Jan. 3, 2013, 9:22 p.m.
On Thursday, 3 January 2013 at 20:36, Marko Lindqvist wrote:
> Use of $(top_srcdir) in TESTS is an error causing automake-1.13
> to abort. Disable the tests completely.
> +Upstream-status: Not sent

Is the real fix as simple as removing the $(top_srcdir) line, or is there a more complicate reason as to why we can't fix this properly and submit it upstream?

Ross
Marko Lindqvist - Jan. 3, 2013, 9:49 p.m.
On 3 January 2013 23:22, Ross Burton <ross.burton@intel.com> wrote:
> On Thursday, 3 January 2013 at 20:36, Marko Lindqvist wrote:
>> Use of $(top_srcdir) in TESTS is an error causing automake-1.13
>> to abort. Disable the tests completely.
>> +Upstream-status: Not sent
>
> Is the real fix as simple as removing the $(top_srcdir) line, or is there a more complicate reason as to why we can't fix this properly and submit it upstream?
>
> Ross

 No, it's not that simple. Actually need to use $(top_srcdir) just
indicates the real problem, which is that test script lives in
srctree. Given that fix to problems of that category easily take
significant amount of work, and oe does not need the tests, I think
it's ok to leave these to upstream (should file bugreports, of
course).


 - ML
Marko Lindqvist - Jan. 3, 2013, 10:20 p.m.
On 3 January 2013 23:49, Marko Lindqvist <cazfi74@gmail.com> wrote:
> On 3 January 2013 23:22, Ross Burton <ross.burton@intel.com> wrote:
>> On Thursday, 3 January 2013 at 20:36, Marko Lindqvist wrote:
>>> Use of $(top_srcdir) in TESTS is an error causing automake-1.13
>>> to abort. Disable the tests completely.
>>> +Upstream-status: Not sent

 This should be "Inappropriate" of course, not "Not sent" as if it's
proper patch I've not yet sent for some reason.

 Many other Upstream-Status could be already changed from "Submitted"
to "Accepted" or "Fixed", but those one can find out following the
ticket numbers already there.


 - ML

Patch

diff --git a/meta/recipes-support/popt/popt/disable_tests.patch b/meta/recipes-support/popt/popt/disable_tests.patch
new file mode 100644
index 0000000..d9f6324
--- /dev/null
+++ b/meta/recipes-support/popt/popt/disable_tests.patch
@@ -0,0 +1,21 @@ 
+Use of $(top_srcdir) in TESTS is an error which causes
+automake-1.13 to abort. Just remove tests.
+
+Upstream-status: Not sent
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd popt-1.16/Makefile.am popt-1.16/Makefile.am
+--- popt-1.16/Makefile.am	2010-05-04 23:55:54.000000000 +0300
++++ popt-1.16/Makefile.am	2013-01-02 13:34:29.540361391 +0200
+@@ -34,11 +34,6 @@
+
+ noinst_SCRIPTS = testit.sh
+
+-TESTS_ENVIRONMENT = \
+-test1="$(top_builddir)/test1"
+-
+-TESTS = $(top_srcdir)/testit.sh
+-
+ include_HEADERS = popt.h
+
+ usrlibdir = $(libdir)
diff --git a/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index 91b0d60..aa4e379 100644
--- a/meta/recipes-support/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
@@ -4,11 +4,12 @@  SECTION = "libs"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
            file://pkgconfig_fix.patch \
            file://popt_fix_for_automake-1.12.patch \
+           file://disable_tests.patch \
           "
 
 SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"