Skip to content

Commit 39cc242

Browse files
committed
CI: simplify x86 linux test instructions
1 parent 5fcd021 commit 39cc242

File tree

3 files changed

+11
-32
lines changed

3 files changed

+11
-32
lines changed

ci/zinc/linux_package.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
. ./ci/zinc/linux_base.sh
44

5-
cp LICENSE $RELEASE_STAGING/
6-
cp zig-cache/langref.html $RELEASE_STAGING/docs/
7-
85
# Remove the unnecessary bin dir in $prefix/bin/zig
96
mv $RELEASE_STAGING/bin/zig $RELEASE_STAGING/
107
rmdir $RELEASE_STAGING/bin

ci/zinc/linux_test_stage3_debug.sh

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,12 @@ echo "Looking for non-conforming code formatting..."
5050
echo "Formatting errors can be fixed by running 'zig fmt' on the files printed here."
5151
stage3/bin/zig fmt --check . --exclude test/cases/
5252

53-
stage3/bin/zig build test-compiler-rt -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
54-
stage3/bin/zig build test-behavior -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
55-
stage3/bin/zig build test-std -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
56-
stage3/bin/zig build test-universal-libc -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
57-
stage3/bin/zig build test-compare-output -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
58-
stage3/bin/zig build test-asm-link -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
59-
stage3/bin/zig build test-fmt -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
60-
stage3/bin/zig build test-translate-c -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
61-
stage3/bin/zig build test-run-translated-c -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
62-
stage3/bin/zig build test-standalone -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
63-
stage3/bin/zig build test-cli -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
64-
stage3/bin/zig build test-cases -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
65-
stage3/bin/zig build test-link -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
66-
stage3/bin/zig build test-stack-traces -fqemu -fwasmtime -fstage1
67-
stage3/bin/zig build docs -fqemu -fwasmtime -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
53+
stage3/bin/zig build test \
54+
-fqemu \
55+
-fwasmtime \
56+
-Dstatic-llvm \
57+
-Dtarget=native-native-musl \
58+
--search-prefix "$DEPS_LOCAL"
6859

6960
# Explicit exit helps show last command duration.
7061
exit

ci/zinc/linux_test_stage3_release.sh

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,7 @@ cd $WORKSPACE
5858

5959
ZIG="$RELEASE_STAGING/bin/zig"
6060

61-
$ZIG build \
62-
test-compiler-rt \
63-
test-behavior \
64-
test-std \
65-
test-universal-libc \
66-
test-compare-output \
67-
test-asm-link \
68-
test-translate-c \
69-
test-run-translated-c \
70-
test-standalone \
71-
test-cli \
72-
test-cases \
73-
test-link \
61+
$ZIG build test \
7462
-fqemu \
7563
-fwasmtime \
7664
-Dstatic-llvm \
@@ -84,8 +72,11 @@ $ZIG test lib/std/std.zig \
8472
-femit-docs=$RELEASE_STAGING/docs/std \
8573
-fno-emit-bin
8674

75+
cp LICENSE $RELEASE_STAGING/
76+
cp zig-cache/langref.html $RELEASE_STAGING/docs/
77+
8778
# Look for HTML errors.
88-
tidy --drop-empty-elements no -qe zig-cache/langref.html
79+
tidy --drop-empty-elements no -qe $RELEASE_STAGING/docs/langref.html
8980

9081
# Explicit exit helps show last command duration.
9182
exit

0 commit comments

Comments
 (0)