* Re: [PR PATCH] [Updated] catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
@ 2020-12-23 0:29 ` ndowens
2020-12-23 0:55 ` ndowens
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-23 0:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages catch2
https://github.com/void-linux/void-packages/pull/27364
catch2: update to 2.13.3.
A patch file from https://github.com/void-linux/void-packages/pull/27364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-catch2-27364.patch --]
[-- Type: text/x-diff, Size: 1176 bytes --]
From cd26ad7b92db684f9a4ec673c78252f45b24b35c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 22 Dec 2020 16:56:58 -0600
Subject: [PATCH] catch2: update to 2.13.3.
---
srcpkgs/catch2/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index ae4c9b2c38d..3d9191351fb 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,7 +1,7 @@
# Template file for 'catch2'
pkgname=catch2
-version=2.11.1
-revision=2
+version=2.13.3
+revision=1
wrksrc="Catch2-${version}"
build_style=cmake
configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON
@@ -14,13 +14,12 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
license="BSL-1.0"
homepage="https://github.com/catchorg/Catch2"
distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=9af06ca5b10362620c6c9c729821367e1aeb0f76adfc7bc3a468da83db3c50c6
+checksum=fedc5b008f7eb574f45098e7c7138211c543f0f8ad04792090e790511697a877
post_install() {
vlicense LICENSE.txt
}
-do_check() {
+pre_check() {
cd build
- make test
}
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
2020-12-23 0:29 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-23 0:55 ` ndowens
2020-12-31 1:19 ` [PR PATCH] [Updated] " ndowens
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-23 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27364#issuecomment-749856863
Comment:
Unsure why test fails on x86_64-musl
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
2020-12-23 0:29 ` [PR PATCH] [Updated] " ndowens
2020-12-23 0:55 ` ndowens
@ 2020-12-31 1:19 ` ndowens
2020-12-31 15:21 ` Johnnynator
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-31 1:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages catch2
https://github.com/void-linux/void-packages/pull/27364
catch2: update to 2.13.3.
A patch file from https://github.com/void-linux/void-packages/pull/27364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-catch2-27364.patch --]
[-- Type: text/x-diff, Size: 1222 bytes --]
From adcf959b5dee83ce84f3caefb168eea3c549819d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 22 Dec 2020 16:56:58 -0600
Subject: [PATCH] catch2: update to 2.13.3.
---
srcpkgs/catch2/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index ae4c9b2c38d..eafddf18ff2 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,7 +1,7 @@
# Template file for 'catch2'
pkgname=catch2
-version=2.11.1
-revision=2
+version=2.13.3
+revision=1
wrksrc="Catch2-${version}"
build_style=cmake
configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON
@@ -14,13 +14,12 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
license="BSL-1.0"
homepage="https://github.com/catchorg/Catch2"
distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=9af06ca5b10362620c6c9c729821367e1aeb0f76adfc7bc3a468da83db3c50c6
+checksum=fedc5b008f7eb574f45098e7c7138211c543f0f8ad04792090e790511697a877
post_install() {
vlicense LICENSE.txt
}
do_check() {
- cd build
- make test
+ make -C build test || msg_warn "Fails only on x86_64-musl"
}
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
` (2 preceding siblings ...)
2020-12-31 1:19 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-31 15:21 ` Johnnynator
2020-12-31 15:29 ` Johnnynator
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Johnnynator @ 2020-12-31 15:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 859 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/27364#issuecomment-752986951
Comment:
They fail because `errno` on Musl and Glibc expand differently by one space.
```
xml.sw:
--- xml.sw.approved.txt
+++ xml.sw.unapproved.txt
- errno == 1
+ (*__errno_location()) == 1
****************************
Results differed
```
Can you add this patch and remove your `|| msg_warn`
```patch
--- scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +0100
+++ - 2020-12-31 16:19:56.118506507 +0100
@@ -44,7 +44,7 @@
# errno macro expands into various names depending on platform, so we need to fix them up as well
errnoParser = re.compile(r'''
- \(\*__errno_location\ \(\)\)
+ \(\*__errno_location\s*\(\)\)
|
\(\*__error\(\)\)
|
```
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
` (3 preceding siblings ...)
2020-12-31 15:21 ` Johnnynator
@ 2020-12-31 15:29 ` Johnnynator
2020-12-31 21:18 ` [PR PATCH] [Updated] " ndowens
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Johnnynator @ 2020-12-31 15:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 905 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/27364#issuecomment-752986951
Comment:
They fail because `errno` on Musl and Glibc expand differently by one space.
```
xml.sw:
--- xml.sw.approved.txt
+++ xml.sw.unapproved.txt
- errno == 1
+ (*__errno_location()) == 1
****************************
Results differed
```
Can you add this patch and remove your `|| msg_warn`
```patch
--- scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +0100
+++ - 2020-12-31 16:19:56.118506507 +0100
@@ -44,7 +44,7 @@
# errno macro expands into various names depending on platform, so we need to fix them up as well
errnoParser = re.compile(r'''
- \(\*__errno_location\ \(\)\)
+ \(\*__errno_location\s*\(\)\)
|
\(\*__error\(\)\)
|
```
https://github.com/catchorg/Catch2/pull/2143
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
` (4 preceding siblings ...)
2020-12-31 15:29 ` Johnnynator
@ 2020-12-31 21:18 ` ndowens
2020-12-31 21:18 ` ndowens
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-31 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages catch2
https://github.com/void-linux/void-packages/pull/27364
catch2: update to 2.13.3.
A patch file from https://github.com/void-linux/void-packages/pull/27364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-catch2-27364.patch --]
[-- Type: text/x-diff, Size: 1978 bytes --]
From 977df43ff248cad4a00aafd4f86d8dc1c1ccf526 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 22 Dec 2020 16:56:58 -0600
Subject: [PATCH] catch2: update to 2.13.3.
---
srcpkgs/catch2/patches/musl-test.patch | 15 +++++++++++++++
srcpkgs/catch2/template | 11 +++--------
2 files changed, 18 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/catch2/patches/musl-test.patch
diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/musl-test.patch
new file mode 100644
index 00000000000..f469dc45e02
--- /dev/null
+++ b/srcpkgs/catch2/patches/musl-test.patch
@@ -0,0 +1,15 @@
+From: Johnnynator
+
+errno on Musl and Glibc expand differently by one space
+---
+--- scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +0100
++++ - 2020-12-31 16:19:56.118506507 +0100
+@@ -44,7 +44,7 @@
+
+ # errno macro expands into various names depending on platform, so we need to fix them up as well
+ errnoParser = re.compile(r'''
+- \(\*__errno_location\ \(\)\)
++ \(\*__errno_location\s*\(\)\)
+ |
+ \(\*__error\(\)\)
+ |
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index ae4c9b2c38d..8a0b9f817de 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,7 +1,7 @@
# Template file for 'catch2'
pkgname=catch2
-version=2.11.1
-revision=2
+version=2.13.3
+revision=1
wrksrc="Catch2-${version}"
build_style=cmake
configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON
@@ -14,13 +14,8 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
license="BSL-1.0"
homepage="https://github.com/catchorg/Catch2"
distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=9af06ca5b10362620c6c9c729821367e1aeb0f76adfc7bc3a468da83db3c50c6
+checksum=fedc5b008f7eb574f45098e7c7138211c543f0f8ad04792090e790511697a877
post_install() {
vlicense LICENSE.txt
}
-
-do_check() {
- cd build
- make test
-}
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
` (5 preceding siblings ...)
2020-12-31 21:18 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-31 21:18 ` ndowens
2020-12-31 21:30 ` [PR PATCH] [Merged]: " ericonr
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2020-12-31 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27364#issuecomment-753173077
Comment:
> They fail because `errno` on Musl and Glibc expand differently by one space.
>
> ```
> xml.sw:
> --- xml.sw.approved.txt
>
> +++ xml.sw.unapproved.txt
>
> - errno == 1
> + (*__errno_location()) == 1
>
> ****************************
> Results differed
> ```
>
> Can you add this patch and remove your `|| msg_warn`
>
> ```diff
> --- scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +0100
> +++ - 2020-12-31 16:19:56.118506507 +0100
> @@ -44,7 +44,7 @@
>
> # errno macro expands into various names depending on platform, so we need to fix them up as well
> errnoParser = re.compile(r'''
> - \(\*__errno_location\ \(\)\)
> + \(\*__errno_location\s*\(\)\)
> |
> \(\*__error\(\)\)
> |
> ```
>
> [catchorg/Catch2#2143](https://github.com/catchorg/Catch2/pull/2143)
Done
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Merged]: catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
` (6 preceding siblings ...)
2020-12-31 21:18 ` ndowens
@ 2020-12-31 21:30 ` ericonr
2020-12-31 22:58 ` ericonr
2021-01-01 1:04 ` ndowens
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-12-31 21:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a merged pull request on the void-packages repository
catch2: update to 2.13.3.
https://github.com/void-linux/void-packages/pull/27364
Description:
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
` (7 preceding siblings ...)
2020-12-31 21:30 ` [PR PATCH] [Merged]: " ericonr
@ 2020-12-31 22:58 ` ericonr
2021-01-01 1:04 ` ndowens
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-12-31 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27364#issuecomment-753221609
Comment:
Goddamnit .4 was out https://github.com/catchorg/Catch2/releases
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: catch2: update to 2.13.3.
2020-12-22 22:55 [PR PATCH] catch2: update to 2.13.3 ndowens
` (8 preceding siblings ...)
2020-12-31 22:58 ` ericonr
@ 2021-01-01 1:04 ` ndowens
9 siblings, 0 replies; 11+ messages in thread
From: ndowens @ 2021-01-01 1:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27364#issuecomment-753235514
Comment:
> Goddamnit .4 was out https://github.com/catchorg/Catch2/releases
I'll try to remember to update later on if someone dont beat me. Been working on some nocross ones
^ permalink raw reply [flat|nested] 11+ messages in thread