| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-10-19 11:50:23+02:00 |
| committer |  GitHub <noreply@github.com> 2025-10-19 11:50:23+02:00 |
| log | 328b12124062f905482e62b91bd7d1cbeee34f9e |
| tree | 94e5b5ccdf57b52d4e362549aa0a29fd78fe8122 |
| parent | 38caa4902f87f63246d8bef9596f2cb7ad8bbbda |
| parent | 653a1919651f6c9e84e96a6acf8915f57773a7dc |
| signature |  Signed by PGP key B5690EEEBB952194 |
Merge pull request #25627 from alexrp/qemu-10.1.1-patched
`ci`: switch to patched QEMU 10.1.1.14 files changed, 3 insertions(+), 8 deletions(-)
ci/x86_64-linux-debug-llvm.sh+1-1
| ... | @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" | ... | @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" |
| 11 | PREFIX="$HOME/deps/$CACHE_BASENAME" | 11 | PREFIX="$HOME/deps/$CACHE_BASENAME" |
| 12 | ZIG="$PREFIX/bin/zig" | 12 | ZIG="$PREFIX/bin/zig" |
| 13 | 13 | ||
| 14 | export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" | 14 | export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH" |
| 15 | 15 | ||
| 16 | # Override the cache directories because they won't actually help other CI runs | 16 | # Override the cache directories because they won't actually help other CI runs |
| 17 | # which will be testing alternate versions of zig, and ultimately would just | 17 | # which will be testing alternate versions of zig, and ultimately would just |
ci/x86_64-linux-debug.sh+1-1
| ... | @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" | ... | @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" |
| 11 | PREFIX="$HOME/deps/$CACHE_BASENAME" | 11 | PREFIX="$HOME/deps/$CACHE_BASENAME" |
| 12 | ZIG="$PREFIX/bin/zig" | 12 | ZIG="$PREFIX/bin/zig" |
| 13 | 13 | ||
| 14 | export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" | 14 | export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH" |
| 15 | 15 | ||
| 16 | # Override the cache directories because they won't actually help other CI runs | 16 | # Override the cache directories because they won't actually help other CI runs |
| 17 | # which will be testing alternate versions of zig, and ultimately would just | 17 | # which will be testing alternate versions of zig, and ultimately would just |
ci/x86_64-linux-release.sh+1-1
| ... | @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" | ... | @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" |
| 11 | PREFIX="$HOME/deps/$CACHE_BASENAME" | 11 | PREFIX="$HOME/deps/$CACHE_BASENAME" |
| 12 | ZIG="$PREFIX/bin/zig" | 12 | ZIG="$PREFIX/bin/zig" |
| 13 | 13 | ||
| 14 | export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" | 14 | export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH" |
| 15 | 15 | ||
| 16 | # Override the cache directories because they won't actually help other CI runs | 16 | # Override the cache directories because they won't actually help other CI runs |
| 17 | # which will be testing alternate versions of zig, and ultimately would just | 17 | # which will be testing alternate versions of zig, and ultimately would just |
lib/std/Thread.zig-5
| ... | @@ -1695,11 +1695,6 @@ test "Thread.getCurrentId" { | ... | @@ -1695,11 +1695,6 @@ test "Thread.getCurrentId" { |
| 1695 | test "thread local storage" { | 1695 | test "thread local storage" { |
| 1696 | if (builtin.single_threaded) return error.SkipZigTest; | 1696 | if (builtin.single_threaded) return error.SkipZigTest; |
| 1697 | 1697 | ||
| 1698 | if (builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) { | ||
| 1699 | // https://github.com/ziglang/zig/issues/24061 | ||
| 1700 | return error.SkipZigTest; | ||
| 1701 | } | ||
| 1702 | |||
| 1703 | const thread1 = try Thread.spawn(.{}, testTls, .{}); | 1698 | const thread1 = try Thread.spawn(.{}, testTls, .{}); |
| 1704 | const thread2 = try Thread.spawn(.{}, testTls, .{}); | 1699 | const thread2 = try Thread.spawn(.{}, testTls, .{}); |
| 1705 | try testTls(); | 1700 | try testTls(); |