CI: simplify x86 linux test instructions

3 files changed, 11 insertions, 32 deletions

diff --git a/ci/zinc/linux_package.sh b/ci/zinc/linux_package.sh
index 547a2d76b8..b89e2d8511 100755
--- a/ci/zinc/linux_package.sh
+++ b/ci/zinc/linux_package.sh
@@ -2,9 +2,6 @@
 
 . ./ci/zinc/linux_base.sh
 
-cp LICENSE $RELEASE_STAGING/
-cp zig-cache/langref.html $RELEASE_STAGING/docs/
-
 # Remove the unnecessary bin dir in $prefix/bin/zig
 mv $RELEASE_STAGING/bin/zig $RELEASE_STAGING/
 rmdir $RELEASE_STAGING/bin
diff --git a/ci/zinc/linux_test_stage3_debug.sh b/ci/zinc/linux_test_stage3_debug.sh
index 85cfb57b2e..d40ad9da11 100755
--- a/ci/zinc/linux_test_stage3_debug.sh
+++ b/ci/zinc/linux_test_stage3_debug.sh
@@ -50,21 +50,12 @@ echo "Looking for non-conforming code formatting..."
 echo "Formatting errors can be fixed by running 'zig fmt' on the files printed here."
 stage3/bin/zig fmt --check . --exclude test/cases/
 
-stage3/bin/zig build test-compiler-rt      -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-behavior         -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-std              -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-universal-libc   -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-compare-output   -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-asm-link         -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-fmt              -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-translate-c      -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-run-translated-c -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-standalone       -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-cli              -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-cases            -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-link             -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
-stage3/bin/zig build test-stack-traces     -fqemu -fwasmtime -fstage1
-stage3/bin/zig build docs                  -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
+stage3/bin/zig build test \
+  -fqemu \
+  -fwasmtime \
+  -Dstatic-llvm \
+  -Dtarget=native-native-musl \
+  --search-prefix "$DEPS_LOCAL"
 
 # Explicit exit helps show last command duration.
 exit
diff --git a/ci/zinc/linux_test_stage3_release.sh b/ci/zinc/linux_test_stage3_release.sh
index 764c89db8f..dd906f70fb 100755
--- a/ci/zinc/linux_test_stage3_release.sh
+++ b/ci/zinc/linux_test_stage3_release.sh
@@ -58,19 +58,7 @@ cd $WORKSPACE
 
 ZIG="$RELEASE_STAGING/bin/zig"
 
-$ZIG build \
-  test-compiler-rt \
-  test-behavior \
-  test-std \
-  test-universal-libc \
-  test-compare-output \
-  test-asm-link \
-  test-translate-c \
-  test-run-translated-c \
-  test-standalone \
-  test-cli \
-  test-cases \
-  test-link \
+$ZIG build test \
   -fqemu \
   -fwasmtime \
   -Dstatic-llvm \
@@ -84,8 +72,11 @@ $ZIG test lib/std/std.zig \
   -femit-docs=$RELEASE_STAGING/docs/std \
   -fno-emit-bin
 
+cp LICENSE $RELEASE_STAGING/
+cp zig-cache/langref.html $RELEASE_STAGING/docs/
+
 # Look for HTML errors.
-tidy --drop-empty-elements no -qe zig-cache/langref.html
+tidy --drop-empty-elements no -qe $RELEASE_STAGING/docs/langref.html
 
 # Explicit exit helps show last command duration.
 exit