summaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorFlorian "sp1rit"​ <sp1rit@disroot.org>2024-11-01 13:57:55 +0100
committerJussi Pakkanen <jussi.pakkanen@mailbox.org>2025-06-03 15:43:58 +0300
commit98b1980b5359672e03bc4296af7528b2fce88d49 (patch)
tree530df6436853de2e54c29973364b0decfc5a6d36 /test cases
parent4a14c4faf93361832ecb0134e1c0f58a239b4f15 (diff)
downloadmeson-98b1980b5359672e03bc4296af7528b2fce88d49.tar.gz
wrap: Lock subproject directory when downloading wraps
To avoid raceconditions, where one instance of meson currently downloads a subproject defined in a wrapfile, while another either a. starts the download itself too b. attemts to evaluate the partially downloaded subproject wraplock introduces a lockfile, which should prevent simultaneous access of subprojects by wrap between different instances of meson.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/failing/33 non-root subproject/test.json2
-rw-r--r--test cases/failing/73 subproj dependency not-found and required/test.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/test cases/failing/33 non-root subproject/test.json b/test cases/failing/33 non-root subproject/test.json
index 52baf6a65..d379a4334 100644
--- a/test cases/failing/33 non-root subproject/test.json
+++ b/test cases/failing/33 non-root subproject/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/33 non-root subproject/some/meson.build:1:0: ERROR: Neither a subproject directory nor a someproj.wrap file was found."
+ "line": "test cases/failing/33 non-root subproject/some/meson.build:1:0: ERROR: Attempted to resolve subproject without subprojects directory present."
}
]
}
diff --git a/test cases/failing/73 subproj dependency not-found and required/test.json b/test cases/failing/73 subproj dependency not-found and required/test.json
index 11ab0318b..e79e28429 100644
--- a/test cases/failing/73 subproj dependency not-found and required/test.json
+++ b/test cases/failing/73 subproj dependency not-found and required/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/73 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found."
+ "line": "test cases/failing/73 subproj dependency not-found and required/meson.build:2:10: ERROR: Attempted to resolve subproject without subprojects directory present."
}
]
}