Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / meson
Commits:
950fe707 by Jan Alexander Steffens (heftig) at 2024-12-09T16:29:17+01:00
1.6.0-5: python 3.13
- - - - -
3 changed files:
- .SRCINFO
- + 0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = meson
pkgdesc = High productivity build system
pkgver = 1.6.0
- pkgrel = 4
+ pkgrel = 5
url = https://mesonbuild.com/
arch = any
license = Apache-2.0
@@ -67,6 +67,7 @@ pkgbase = meson
source = cross-lib32
source = native-clang
source = 0001-Skip-broken-tests.patch
+ source = 0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
source = fix-cmake.diff
source = fix-gir.diff
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
@@ -78,6 +79,7 @@ pkgbase = meson
b2sums =
9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
b2sums =
7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
b2sums =
f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54
+ b2sums =
9202300b5ddac7017fdc1865a4e4298f606d39e39ccb379284de998decc621491761804bb88f7e1b2cd8893e5f8f7300f3b37f305ef3cbad40ee4693418e8167
b2sums =
8e75e4f6cac65cef19dade915528d05fedecf83586c482db17ebe1ed6399f1539fa74687fb7dad9747b8d2b2ca2fcfe89af049e19aedf489d34de93aec61dcbb
b2sums =
8f00fa21777fe012b6e3cb880b0442ba9074d90ab8a2c7b7c67e8c69e418ef0625a047f372f68c43b775f95c36f9119d6997fd337f2296b036e89e306346abbd
=====================================
0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
=====================================
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Mon, 9 Dec 2024 16:18:50 +0100
+Subject: [PATCH] tests: Avoid modifying test dirs in allplatformtests
+
+Tests can tread on each other's toes when parallelism is high enough.
+
+For a concrete case, `test_prebuilt_shared_lib` creates an object file
+in the `17 prebuilt shared` test dir.
+
+`test_prebuilt_shared_lib_rpath_same_prefix` uses `shutil.copytree` to
+copy that same test dir to a temporary location.
+
+If the former test cleans up its object file while `copytree` is
+running, the copy can fail with a fatal ENOENT `shutil.Error`.
+
+Use `copy_srcdir` in all tests that modify the testdir (that I spotted)
+to prevent this from happening.
+---
+ unittests/allplatformstests.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
+index cadbc40e9680..69bdb12d3f4a 100644
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -1732,7 +1732,7 @@ class AllPlatformTests(BasePlatformTests):
+
+ def test_prebuilt_static_lib(self):
+ (cc, stlinker, object_suffix, _) = self.detect_prebuild_env()
+- tdir = os.path.join(self.unit_test_dir, '16 prebuilt static')
++ tdir = self.copy_srcdir(os.path.join(self.unit_test_dir, '16 prebuilt
static'))
+ source = os.path.join(tdir, 'libdir/best.c')
+ objectfile = os.path.join(tdir, 'libdir/best.' + object_suffix)
+ stlibfile = os.path.join(tdir, 'libdir/libbest.a')
+@@ -1766,7 +1766,7 @@ class AllPlatformTests(BasePlatformTests):
+
+ def test_prebuilt_shared_lib(self):
+ (cc, _, object_suffix, shared_suffix) = self.detect_prebuild_env()
+- tdir = os.path.join(self.unit_test_dir, '17 prebuilt shared')
++ tdir = self.copy_srcdir(os.path.join(self.unit_test_dir, '17 prebuilt
shared'))
+ source = os.path.join(tdir, 'alexandria.c')
+ objectfile = os.path.join(tdir, 'alexandria.' + object_suffix)
+ impfile = os.path.join(tdir, 'alexandria.lib')
+@@ -1981,7 +1981,7 @@ class AllPlatformTests(BasePlatformTests):
+ https://github.com/mesonbuild/meson/issues/2785
+ '''
+ (cc, stlinker, objext, shext) = self.detect_prebuild_env()
+- testdir = os.path.join(self.unit_test_dir, '18 pkgconfig static')
++ testdir = self.copy_srcdir(os.path.join(self.unit_test_dir, '18
pkgconfig static'))
+ source = os.path.join(testdir, 'foo.c')
+ objectfile = os.path.join(testdir, 'foo.' + objext)
+ stlibfile = os.path.join(testdir, 'libfoo.a')
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=meson
pkgver=1.6.0
-pkgrel=4
+pkgrel=5
pkgdesc="High productivity build system"
url="https://mesonbuild.com/";
arch=(any)
@@ -77,6 +77,7 @@ source=(
cross-lib32
native-clang
0001-Skip-broken-tests.patch
+ 0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
fix-cmake.diff
fix-gir.diff
)
@@ -88,6 +89,7 @@
b2sums=('c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
'f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54'
+
'9202300b5ddac7017fdc1865a4e4298f606d39e39ccb379284de998decc621491761804bb88f7e1b2cd8893e5f8f7300f3b37f305ef3cbad40ee4693418e8167'
'8e75e4f6cac65cef19dade915528d05fedecf83586c482db17ebe1ed6399f1539fa74687fb7dad9747b8d2b2ca2fcfe89af049e19aedf489d34de93aec61dcbb'
'8f00fa21777fe012b6e3cb880b0442ba9074d90ab8a2c7b7c67e8c69e418ef0625a047f372f68c43b775f95c36f9119d6997fd337f2296b036e89e306346abbd')
validpgpkeys=(
@@ -99,6 +101,7 @@ prepare() {
# Pass tests
patch -Np1 -i ../0001-Skip-broken-tests.patch
+ patch -Np1 -i
../0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
# Unbreak CMake
# https://github.com/mesonbuild/meson/issues/13888
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/950fe707ca5cdc26e7a789ac0e5595df2212a820
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/950fe707ca5cdc26e7a789ac0e5595df2212a820
You're receiving this email because of your account on gitlab.archlinux.org.
