From 252df04ceb4c741f776287235437b977529a87a6 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Mon, 24 Feb 2025 09:35:16 +0200 Subject: [PATCH] ci: use `-silent` for the longer test runs (suppress most OK lines, to reduce scrolling on failure) --- ci/freebsd_ci.vsh | 8 ++++---- ci/linux_ci.vsh | 31 +++++++++++++++++++------------ ci/macos_ci.vsh | 14 +++++++------- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/ci/freebsd_ci.vsh b/ci/freebsd_ci.vsh index d406d17494..db576fcdd5 100644 --- a/ci/freebsd_ci.vsh +++ b/ci/freebsd_ci.vsh @@ -29,19 +29,19 @@ fn build_fast_script() { } fn check_math() { - exec('v test vlib/math') + exec('v -silent test vlib/math') println('Test the math module, using only the pure V versions,') println(' without the .c.v overrides.') - exec('v -exclude @vlib/math/*.c.v test vlib/math') + exec('v -silent -exclude @vlib/math/*.c.v test vlib/math') } fn check_compress() { - exec('v test vlib/compress') + exec('v -silent test vlib/compress') } fn run_essential_tests() { if common.is_github_job { - exec('VTEST_JUST_ESSENTIAL=1 v test-self') + exec('VTEST_JUST_ESSENTIAL=1 v -silent test-self') } else { exec('VTEST_JUST_ESSENTIAL=1 v -progress test-self') } diff --git a/ci/linux_ci.vsh b/ci/linux_ci.vsh index 2f3d0a796c..bc60ca4bd5 100644 --- a/ci/linux_ci.vsh +++ b/ci/linux_ci.vsh @@ -5,7 +5,7 @@ import common { Task, exec } // fn all_code_is_formatted() { if common.is_github_job { - exec('VJOBS=1 v test-cleancode') + exec('VJOBS=1 v -silent test-cleancode') } else { exec('v -progress test-cleancode') } @@ -18,12 +18,12 @@ fn verify_v_test_works() { } fn test_pure_v_math_module() { - exec('v -exclude @vlib/math/*.c.v test vlib/math/') + exec('v -silent -exclude @vlib/math/*.c.v test vlib/math/') } fn self_tests() { if common.is_github_job { - exec('VJOBS=1 v test-self vlib') + exec('VJOBS=1 v -silent test-self vlib') } else { exec('v -progress test-self vlib') } @@ -31,7 +31,7 @@ fn self_tests() { fn build_examples() { if common.is_github_job { - exec('v build-examples') + exec('v -silent build-examples') } else { exec('v -progress build-examples') } @@ -129,11 +129,11 @@ fn v_self_compilation_usecache_tcc() { } fn test_password_input_tcc() { - exec('v test examples/password/') + exec('v -silent test examples/password/') } fn test_readline_tcc() { - exec('v test examples/readline/') + exec('v -silent test examples/readline/') } fn test_leak_detector_tcc() { @@ -178,12 +178,17 @@ fn run_sanitizers_gcc() { } fn v_self_compilation_gcc() { - exec('v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v') + exec('v -o v2 cmd/v') + exec('./v2 -o v3 cmd/v') + exec('./v3 -o v4 cmd/v') } fn v_self_compilation_usecache_gcc() { exec('unset VFLAGS') - exec('v -usecache examples/hello_world.v && examples/hello_world') + + exec('v -usecache examples/hello_world.v') + exec('examples/hello_world') + exec('v -o v2 -usecache cmd/v') exec('./v2 -o v3 -usecache cmd/v') exec('./v3 version') @@ -203,11 +208,12 @@ fn self_tests_gcc() { } fn self_tests_prod_gcc() { - exec('v -o vprod -prod cmd/v && ./vprod test-self vlib') + exec('v -o vprod -prod cmd/v') + exec('./vprod -silent test-self vlib') } fn self_tests_cstrict_gcc() { - exec('VTEST_JUST_ESSENTIAL=1 V_CI_CSTRICT=1 v -cc gcc -cstrict test-self vlib') + exec('VTEST_JUST_ESSENTIAL=1 V_CI_CSTRICT=1 v -cc gcc -cstrict -silent test-self vlib') } fn build_examples_gcc() { @@ -313,11 +319,12 @@ fn self_tests_clang() { } fn self_tests_vprod_clang() { - exec('v -o vprod -prod cmd/v && ./vprod test-self vlib') + exec('v -o vprod -prod cmd/v') + exec('./vprod -silent test-self vlib') } fn self_tests_cstrict_clang() { - exec('VTEST_JUST_ESSENTIAL=1 V_CI_CSTRICT=1 ./vprod -cstrict test-self vlib') + exec('VTEST_JUST_ESSENTIAL=1 V_CI_CSTRICT=1 ./vprod -cstrict -silent test-self vlib') } fn build_examples_clang() { diff --git a/ci/macos_ci.vsh b/ci/macos_ci.vsh index 102818c88a..7d00034e01 100644 --- a/ci/macos_ci.vsh +++ b/ci/macos_ci.vsh @@ -15,7 +15,7 @@ fn build_with_cstrict() { fn all_code_is_formatted() { if common.is_github_job { - exec('VJOBS=1 v test-cleancode') + exec('VJOBS=1 v -silent test-cleancode') } else { exec('v -progress test-cleancode') } @@ -42,12 +42,12 @@ fn install_iconv() { } fn test_pure_v_math_module() { - exec('v -progress -exclude @vlib/math/*.c.v test vlib/math/') + exec('v -silent -exclude @vlib/math/*.c.v test vlib/math/') } fn self_tests() { if common.is_github_job { - exec('VJOBS=1 v test-self vlib') + exec('VJOBS=1 v -silent test-self vlib') } else { exec('v -progress test-self vlib') } @@ -55,7 +55,7 @@ fn self_tests() { fn build_examples() { if common.is_github_job { - exec('v build-examples') + exec('v -silent build-examples') } else { exec('v -progress build-examples') } @@ -65,7 +65,7 @@ fn build_examples_v_compiled_with_tcc() { exec('v -o vtcc -cc tcc cmd/v') if common.is_github_job { // ensure that examples/veb/veb_example.v etc compiles - exec('./vtcc build-examples') + exec('./vtcc -silent build-examples') } else { exec('./vtcc -progress build-examples') } @@ -104,11 +104,11 @@ fn v_self_compilation_parallel_cc() { } fn test_password_input() { - exec('v -progress test examples/password/') + exec('v -silent test examples/password/') } fn test_readline() { - exec('v -progress test examples/readline/') + exec('v -silent test examples/readline/') } const all_tasks = {