From 2f42a2617b55c497bc13a44f64a921e6d2620acf Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 17 Feb 2022 15:26:26 -0700 Subject: [PATCH] CI: more stage2 test coverage * Test everything on the Linux CI even if we can't run it, because it's our fastest machine. * Test stage2 using a build of stage2 (instead of using `-fno-stage1`) so that compiler-rt is also built with stage2. * Additionally test running x86_64-macos on the macOS CI, both the LLVM backend and x86_64 backend. --- ci/azure/macos_script | 7 +++++-- ci/zinc/linux_test.sh | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 446ad37bb5..160ce5fe03 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -55,8 +55,11 @@ make $JOBS install cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig" make $JOBS install -# TODO figure out why this causes a segmentation fault -# release/bin/zig test ../test/behavior.zig -fno-stage1 -fLLVM -I ../test +# Build stage2 standalone so that we can test stage2 against stage2 compiler-rt. +release/bin/zig build -p stage2 -Denable-llvm + +stage2/bin/zig test ../test/behavior.zig -I../test -fLLVM +stage2/bin/zig test ../test/behavior.zig -I../test release/bin/zig build test-toolchain -Denable-macos-sdk release/bin/zig build test-std diff --git a/ci/zinc/linux_test.sh b/ci/zinc/linux_test.sh index 453269029d..775d6b78b4 100755 --- a/ci/zinc/linux_test.sh +++ b/ci/zinc/linux_test.sh @@ -4,13 +4,20 @@ ZIG=$DEBUG_STAGING/bin/zig -$ZIG test test/behavior.zig -fno-stage1 -I test -fLLVM -$ZIG test test/behavior.zig -fno-stage1 -I test -fLLVM -target aarch64-linux --test-cmd qemu-aarch64 --test-cmd-bin -$ZIG test test/behavior.zig -fno-stage1 -I test -ofmt=c -$ZIG test test/behavior.zig -fno-stage1 -I test -target wasm32-wasi --test-cmd wasmtime --test-cmd-bin -$ZIG test test/behavior.zig -fno-stage1 -I test -target arm-linux --test-cmd qemu-arm --test-cmd-bin -$ZIG test test/behavior.zig -fno-stage1 -I test -target aarch64-linux --test-cmd qemu-aarch64 --test-cmd-bin -$ZIG test test/behavior.zig -fno-stage1 -I test +# Build stage2 standalone so that we can test stage2 against stage2 compiler-rt. +$ZIG build -p stage2 -Denable-llvm + +stage2/bin/zig test test/behavior.zig -I test -fLLVM +stage2/bin/zig test test/behavior.zig -I test +stage2/bin/zig test test/behavior.zig -I test -fLLVM -target aarch64-linux --test-cmd qemu-aarch64 --test-cmd-bin +stage2/bin/zig test test/behavior.zig -I test -target aarch64-linux --test-cmd qemu-aarch64 --test-cmd-bin +stage2/bin/zig test test/behavior.zig -I test -ofmt=c +stage2/bin/zig test test/behavior.zig -I test -target wasm32-wasi --test-cmd wasmtime --test-cmd-bin +stage2/bin/zig test test/behavior.zig -I test -target arm-linux --test-cmd qemu-arm --test-cmd-bin +stage2/bin/zig test test/behavior.zig -I test -fLLVM -target aarch64-macos --test-no-exec +stage2/bin/zig test test/behavior.zig -I test -target aarch64-macos --test-no-exec +stage2/bin/zig test test/behavior.zig -I test -fLLVM -target x86_64-macos --test-no-exec +stage2/bin/zig test test/behavior.zig -I test -target x86_64-macos --test-no-exec $ZIG build test-behavior -fqemu -fwasmtime $ZIG build test-compiler-rt -fqemu -fwasmtime