[gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/

[Sam James]

commit:     17236bf13b73ff1558fec245631e14f370fbe117
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Mon May  1 13:58:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 03:28:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17236bf1

dev-lang/zig: update testing process for 9999

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/30616
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/zig/zig-9999.ebuild | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 2346feadd70a..dd8650c3aa2c 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -116,6 +116,7 @@ src_configure() {
                -DZIG_USE_LLVM_CONFIG=ON
                -DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
                -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+               -DZIG_NO_LANGREF="$(usex !doc ON OFF)"
        )
 
        cmake_src_configure
@@ -126,17 +127,25 @@ src_compile() {
 
        if use doc; then
                cd "${BUILD_DIR}" || die
-               edo ./zig2 run ../doc/docgen.zig -- --zig ./zig2 
../doc/langref.html.in "${S}/langref.html"
-               edo ./zig2 test ../lib/std/std.zig --zig-lib-dir ../lib 
-fno-emit-bin -femit-docs="${S}/std"
+               mv ./stage3/doc/langref.html "${S}" || die
+               edo ./stage3/bin/zig test ../lib/std/std.zig --zig-lib-dir 
../lib -fno-emit-bin -femit-docs="${S}/std"
        fi
 }
 
 src_test() {
        cd "${BUILD_DIR}" || die
        local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm 
-Dskip-non-native \
-               -Drelease -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)"
-       # TBF zig2 -> stage3/bin/zig when (if) 
https://github.com/ziglang/zig/pull/14255 will be merged
-       edo ./zig2 build test ${ZIG_TEST_ARGS}
+               -Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) 
-Dcpu=$(get_zig_mcpu)"
+       local ZIG_TEST_STEPS=(
+               test-cases test-fmt test-behavior test-compiler-rt 
test-universal-libc test-compare-output
+               test-standalone test-c-abi test-link test-stack-traces test-cli 
test-asm-link test-translate-c
+               test-run-translated-c test-std
+       )
+
+       local step
+       for step in "${ZIG_TEST_STEPS[@]}" ; do
+               edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+       done
 }
 
 src_install() {