diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index d475108cfc..0c72d5927c 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -59,6 +59,7 @@ PTESTS_FAST_META_OE = "\ zeromq \ cjson \ libplist \ + uriparser \ " PTESTS_FAST_META_OE:append:x86 = " mcelog" PTESTS_FAST_META_OE:append:x86-64 = " mcelog" diff --git a/meta-oe/recipes-support/uriparser/uriparser/run-ptest b/meta-oe/recipes-support/uriparser/uriparser/run-ptest new file mode 100644 index 0000000000..6d735b663a --- /dev/null +++ b/meta-oe/recipes-support/uriparser/uriparser/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +./testrunner --gtest_print_time=0 | sed -E '/^\[ RUN/d ; s/\[ OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /' diff --git a/meta-oe/recipes-support/uriparser/uriparser_1.0.0.bb b/meta-oe/recipes-support/uriparser/uriparser_1.0.0.bb index b5a0a9f42d..b9c5100803 100644 --- a/meta-oe/recipes-support/uriparser/uriparser_1.0.0.bb +++ b/meta-oe/recipes-support/uriparser/uriparser_1.0.0.bb @@ -1,16 +1,30 @@ SUMMARY = "RFC 3986 compliant URI parsing library" HOMEPAGE = "https://uriparser.github.io" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://src/COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" +LICENSE = "BSD-3-Clause & LGPL-2.1-or-later" +LICENSE:${PN} = "BSD-3-Clause" +LICENSE:${PN}-ptest = "LGPL-2.1-or-later" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" +LIC_FILES_CHKSUM = "file://src/COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168 \ + file://test/COPYING;md5=b9e6430863a3ea22cf4b0a8518279ed3" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz \ + file://run-ptest" SRC_URI[sha256sum] = "291f25264a5c025005b1bc39de3c029e6a6ca0a8d6cfa5e61cb5b03702c0884d" -inherit cmake github-releases +inherit cmake github-releases ptest UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P\d+(\.\d+)+)" -EXTRA_OECMAKE += "-DURIPARSER_BUILD_DOCS:BOOL=OFF -DURIPARSER_BUILD_TESTS:BOOL=OFF" +PACKAGECONFIG = "${@bb.utils.contains('PTEST_ENABLED', '1', 'test', '', d)} " +PACKAGECONFIG[test] = "-DURIPARSER_BUILD_TESTS:BOOL=ON, -DURIPARSER_BUILD_TESTS:BOOL=OFF, googletest" + +EXTRA_OECMAKE += " \ + -DURIPARSER_BUILD_DOCS:BOOL=OFF \ +" + +do_install_ptest(){ + install ${B}/testrunner ${D}${PTEST_PATH} +} BBCLASSEXTEND += "native"