From c5eff28fd631ddb51cc57ba19f2eb8e912545eff Mon Sep 17 00:00:00 2001 From: Jami Kettunen 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