[PR PATCH] json-c++: run all tests that don't require a git checkout

[PR PATCH] json-c++: run all tests that don't require a git checkout

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]

There is a new pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages json-c++-tests
https://github.com/void-linux/void-packages/pull/37291

json-c++: run all tests that don't require a git checkout
<!-- Uncomment relevant sections and delete options which are not applicable -->

Running the unit tests (including without a git checkout) [is documented here](https://github.com/nlohmann/json#execute-unit-tests).

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37291.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-json-c++-tests-37291.patch --]
[-- Type: text/x-diff, Size: 1139 bytes --]

From 2cfb494f627abe469e86fac6ead5ccc31cd1b707 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 25 May 2022 16:08:38 +0300
Subject: [PATCH] json-c++: run all tests that don't require a git checkout

---
 srcpkgs/json-c++/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 018ef8e1ff74..c0f8729ed021 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,7 +1,7 @@
 # Template file for 'json-c++'
 pkgname=json-c++
 version=3.10.5
-revision=1
+revision=2
 wrksrc="json-${version}"
 build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
@@ -12,9 +12,12 @@ license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
 checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
-# tests only work in git repository
-make_check=no
 
+do_check() {
+	# skip tests requiring wrksrc to be a git clone as they always fail
+	cd build
+	ctest -LE "git_required"
+}
 
 post_install() {
 	vdoc README.md

Re: [PR PATCH] [Updated] json-c++: run all tests that don't require a git checkout

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages json-c++-tests
https://github.com/void-linux/void-packages/pull/37291

json-c++: run all tests that don't require a git checkout
<!-- Uncomment relevant sections and delete options which are not applicable -->

Running the unit tests (including without a git checkout) [is documented here](https://github.com/nlohmann/json#execute-unit-tests).

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37291.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-json-c++-tests-37291.patch --]
[-- Type: text/x-diff, Size: 1305 bytes --]

From c5eff28fd631ddb51cc57ba19f2eb8e912545eff Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 25 May 2022 16:08:38 +0300
Subject: [PATCH] json-c++: run all tests that don't require a git checkout

Also don't build unit test binaries when not needed.
---
 srcpkgs/json-c++/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 018ef8e1ff74..2d07abecaa56 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,7 +1,7 @@
 # Template file for 'json-c++'
 pkgname=json-c++
 version=3.10.5
-revision=1
+revision=2
 wrksrc="json-${version}"
 build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
@@ -12,9 +12,16 @@ license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
 checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
-# tests only work in git repository
-make_check=no
 
+if [ -z "$XBPS_CHECK_PKGS" ] || [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DJSON_BuildTests=OFF"
+fi
+
+do_check() {
+	# skip tests requiring wrksrc to be a git clone as they always fail
+	cd build
+	ctest -LE "git_required"
+}
 
 post_install() {
 	vdoc README.md

Re: json-c++: run all tests that don't require a git checkout

[sgn]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/37291#issuecomment-1138138296

Comment:
It's better to always build tests, and also don't increase revision.

Re: [PR PATCH] [Updated] json-c++: run all tests that don't require a git checkout

[JamiKettunen]

[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages json-c++-tests
https://github.com/void-linux/void-packages/pull/37291

json-c++: run all tests that don't require a git checkout
<!-- Uncomment relevant sections and delete options which are not applicable -->

Running the unit tests (including without a git checkout) [is documented here](https://github.com/nlohmann/json#execute-unit-tests).

I've also disabled building the test binaries if cross-building (they won't be run by `xbps-src` anyway) or when `XBPS_CHECK_PKGS` is not set.

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37291.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-json-c++-tests-37291.patch --]
[-- Type: text/x-diff, Size: 942 bytes --]

From e20575857edef57cbb32a25862bfe34a1b32be31 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 25 May 2022 16:08:38 +0300
Subject: [PATCH] json-c++: run all tests that don't require a git checkout

---
 srcpkgs/json-c++/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 018ef8e1ff74..3cce219ea7ad 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -12,9 +12,12 @@ license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
 checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
-# tests only work in git repository
-make_check=no
 
+do_check() {
+	# skip tests requiring wrksrc to be a git clone as they always fail
+	cd build
+	ctest -LE "git_required"
+}
 
 post_install() {
 	vdoc README.md

Re: [PR PATCH] [Merged]: json-c++: run all tests that don't require a git checkout

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There's a merged pull request on the void-packages repository

json-c++: run all tests that don't require a git checkout
https://github.com/void-linux/void-packages/pull/37291

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

Running the unit tests (including without a git checkout) [is documented here](https://github.com/nlohmann/json#execute-unit-tests).

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->