diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh index b3b1278192d065f4047fd2b507242689808cdae5..e53ebc3281476ade427de65bff3cd33e871b49be 100755 --- a/ci/x86_64-linux-debug-llvm.sh +++ b/ci/x86_64-linux-debug-llvm.sh @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -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" +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" # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh index 868728367a144c03af76620be6b9bdc6e08db174..2b8406ea067a13572f6a3cf554a14de4a4f838ad 100755 --- a/ci/x86_64-linux-debug.sh +++ b/ci/x86_64-linux-debug.sh @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -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" +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" # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh index 78dad0cc1f5c7bc1e8d1b24a9cc5e39a182d86dc..6354100d3a7bd2abc16a3be127e403a3535efe46 100755 --- a/ci/x86_64-linux-release.sh +++ b/ci/x86_64-linux-release.sh @@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -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" +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" # Override the cache directories because they won't actually help other CI runs # which will be testing alternate versions of zig, and ultimately would just diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig index cd019329d36a04074567d6b2817ab0ccb9312274..ce4abada7decf0fa1ee519eade54a1568784cb0a 100644 --- a/lib/std/Thread.zig +++ b/lib/std/Thread.zig @@ -1695,11 +1695,6 @@ test "Thread.getCurrentId" { test "thread local storage" { if (builtin.single_threaded) return error.SkipZigTest; - if (builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) { - // https://github.com/ziglang/zig/issues/24061 - return error.SkipZigTest; - } - const thread1 = try Thread.spawn(.{}, testTls, .{}); const thread2 = try Thread.spawn(.{}, testTls, .{}); try testTls();