* Re: [PR PATCH] [Updated] postgis: enable CUnit tests
2021-07-01 21:22 [PR PATCH] postgis: enable CUnit tests Chocimier
@ 2021-08-07 18:09 ` Chocimier
2021-08-07 18:11 ` Chocimier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2021-08-07 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org CUnit
https://github.com/void-linux/void-packages/pull/31745
postgis: enable CUnit tests
A patch file from https://github.com/void-linux/void-packages/pull/31745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CUnit-31745.patch --]
[-- Type: text/x-diff, Size: 8123 bytes --]
From cf7bd6067a412338a0ea10ce1386f7a5ab0cb0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 1/5] New package: CUnit-2.1.3
---
srcpkgs/CUnit-devel | 1 +
srcpkgs/CUnit/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/CUnit/update | 1 +
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/CUnit-devel
create mode 100644 srcpkgs/CUnit/template
create mode 100644 srcpkgs/CUnit/update
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+ vsed -e 's@./configure@:@' -i bootstrap
+ sh bootstrap .
+}
+
+post_install() {
+ mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/share/doc
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
From 963c16d75617003d7f058496eec03f85d527adc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 2/5] postgis: enable unit tests
---
srcpkgs/postgis/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..6a21ef3cf0fd 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -12,7 +12,7 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
postgresql9.6-libs-devel"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
@@ -21,10 +21,12 @@ changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From 238d59af40ede441596601b8baac38632c59c3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 3/5] postgis-postgresql12: enable unit tests
---
srcpkgs/postgis-postgresql12/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..a079267dd81b 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -13,7 +13,7 @@ hostmakedepends="automake libtool perl pkg-config geos
libgdal-tools postgresql12-libs-devel which"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
@@ -22,10 +22,12 @@ changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From 1e6167ff98dff410a1fe6fd40ed22736a2bb8b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 4/5] postgis-postgresql13: enable unit tests
---
srcpkgs/postgis-postgresql13/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..52a7c4759d1a 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -13,7 +13,7 @@ hostmakedepends="automake libtool perl pkg-config geos
libgdal-tools postgresql-libs-devel which"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
@@ -22,10 +22,12 @@ changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From 12e2ea049b349d5718ddab705e107221c26d31ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 5/5] mosquitto: enable tests
---
srcpkgs/mosquitto/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..d69589505164 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,13 @@ make_install_args="prefix=/usr"
make_check_target=test
conf_files="/etc/mosquitto/mosquitto.conf"
makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
license="EPL-1.0, BSD-3-Clause-Attribution"
homepage="https://mosquitto.org"
distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
system_accounts="_mosquitto"
_mosquitto_homedir="/var/lib/mosquitto"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] postgis: enable CUnit tests
2021-07-01 21:22 [PR PATCH] postgis: enable CUnit tests Chocimier
2021-08-07 18:09 ` [PR PATCH] [Updated] " Chocimier
@ 2021-08-07 18:11 ` Chocimier
2021-08-10 19:56 ` Chocimier
2021-08-11 21:28 ` [PR PATCH] [Merged]: " Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2021-08-07 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org CUnit
https://github.com/void-linux/void-packages/pull/31745
postgis: enable CUnit tests
A patch file from https://github.com/void-linux/void-packages/pull/31745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CUnit-31745.patch --]
[-- Type: text/x-diff, Size: 8360 bytes --]
From 9cb29149b84baaa780cb6206c613f6379c6ff914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 1/5] New package: CUnit-2.1.3
---
srcpkgs/CUnit-devel | 1 +
srcpkgs/CUnit/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/CUnit/update | 1 +
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/CUnit-devel
create mode 100644 srcpkgs/CUnit/template
create mode 100644 srcpkgs/CUnit/update
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+ vsed -e 's@./configure@:@' -i bootstrap
+ sh bootstrap .
+}
+
+post_install() {
+ mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/share/doc
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
From 3765887cfacc75435e77ab815e850c2757982fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 2/5] postgis: enable unit tests
---
srcpkgs/postgis/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..6a21ef3cf0fd 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -12,7 +12,7 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
postgresql9.6-libs-devel"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
@@ -21,10 +21,12 @@ changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From 570419ee50e9bcf7d05dea125db4e0050078bfec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 3/5] postgis-postgresql12: enable unit tests
---
srcpkgs/postgis-postgresql12/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..a079267dd81b 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -13,7 +13,7 @@ hostmakedepends="automake libtool perl pkg-config geos
libgdal-tools postgresql12-libs-devel which"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
@@ -22,10 +22,12 @@ changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From f5cb307e85c561f057282d9f7b363b583ef008ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 4/5] postgis-postgresql13: enable unit tests
---
srcpkgs/postgis-postgresql13/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..52a7c4759d1a 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -13,7 +13,7 @@ hostmakedepends="automake libtool perl pkg-config geos
libgdal-tools postgresql-libs-devel which"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
@@ -22,10 +22,12 @@ changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From 0cd5c85b09e74ab7aa26d78e59805e2b8f2a03ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 5/5] mosquitto: enable tests
---
srcpkgs/mosquitto/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..25b2c4955a7d 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,13 @@ make_install_args="prefix=/usr"
make_check_target=test
conf_files="/etc/mosquitto/mosquitto.conf"
makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
license="EPL-1.0, BSD-3-Clause-Attribution"
homepage="https://mosquitto.org"
distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
system_accounts="_mosquitto"
_mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +31,11 @@ post_extract() {
esac
}
+pre_check(){
+ # fd, addr = self._accept() # socket.timeout: timed out
+ vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
pre_install() {
sed -i 's,sbin,bin,g' */Makefile
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] postgis: enable CUnit tests
2021-07-01 21:22 [PR PATCH] postgis: enable CUnit tests Chocimier
2021-08-07 18:09 ` [PR PATCH] [Updated] " Chocimier
2021-08-07 18:11 ` Chocimier
@ 2021-08-10 19:56 ` Chocimier
2021-08-11 21:28 ` [PR PATCH] [Merged]: " Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2021-08-10 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org CUnit
https://github.com/void-linux/void-packages/pull/31745
postgis: enable CUnit tests
A patch file from https://github.com/void-linux/void-packages/pull/31745.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CUnit-31745.patch --]
[-- Type: text/x-diff, Size: 9284 bytes --]
From 6de0c821437c8064dfdc014e4016361b9efcae9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 1/5] New package: CUnit-2.1.3
---
srcpkgs/CUnit-devel | 1 +
srcpkgs/CUnit/template | 37 +++++++++++++++++++++++++++++++++++++
srcpkgs/CUnit/update | 1 +
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/CUnit-devel
create mode 100644 srcpkgs/CUnit/template
create mode 100644 srcpkgs/CUnit/update
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+ vsed -e 's@./configure@:@' -i bootstrap
+ sh bootstrap .
+}
+
+post_install() {
+ mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/share/doc
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
From 6f184f34bcc823072b924098a7b3bc1e2f6c3a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 2/5] postgis: update to 3.1.3, enable unit tests
---
srcpkgs/postgis/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
# Template file for 'postgis'
pkgname=postgis
-version=3.1.2
+version=3.1.3
revision=1
build_style=gnu-configure
configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
postgresql9.6-libs-devel"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
homepage="https://postgis.net/"
changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From ebd6b2c973cd00241c3f83dcdc6b9b61f7aa8cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 3/5] postgis-postgresql12: update to 3.1.3, enable unit tests
---
srcpkgs/postgis-postgresql12/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
# Template file for 'postgis-postgresql12'
pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
revision=1
wrksrc="postgis-${version}"
build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
libgdal-tools postgresql12-libs-devel which"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
homepage="https://postgis.net/"
changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From d8e9e481dfdda494f937e7f3dd7b84939a670dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 4/5] postgis-postgresql13: update to 3.1.3, enable unit tests
---
srcpkgs/postgis-postgresql13/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
# Template file for 'postgis-postgresql13'
pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
revision=1
wrksrc="postgis-${version}"
build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
libgdal-tools postgresql-libs-devel which"
makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
homepage="https://postgis.net/"
changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
pre_configure() {
./autogen.sh
}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
From f16a416cba01c5c416714caba96c525a11cdbfd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 5/5] mosquitto: enable tests
---
srcpkgs/mosquitto/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
make_check_target=test
conf_files="/etc/mosquitto/mosquitto.conf"
makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
license="EPL-1.0, BSD-3-Clause-Attribution"
homepage="https://mosquitto.org"
distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
system_accounts="_mosquitto"
_mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
esac
}
+pre_check() {
+ # fd, addr = self._accept() # socket.timeout: timed out
+ vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
pre_install() {
sed -i 's,sbin,bin,g' */Makefile
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: postgis: enable CUnit tests
2021-07-01 21:22 [PR PATCH] postgis: enable CUnit tests Chocimier
` (2 preceding siblings ...)
2021-08-10 19:56 ` Chocimier
@ 2021-08-11 21:28 ` Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2021-08-11 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
There's a merged pull request on the void-packages repository
postgis: enable CUnit tests
https://github.com/void-linux/void-packages/pull/31745
Description:
^ permalink raw reply [flat|nested] 5+ messages in thread