From c13c0d04b1af2ef5e9e58c674d2de18b14086a4a Mon Sep 17 00:00:00 2001 From: Christoffer Lerno Date: Tue, 25 Feb 2025 16:02:51 +0100 Subject: [PATCH] Run MSVC with "no-terminal" --- .github/workflows/main.yml | 6 +++--- lib/std/core/runtime_test.c3 | 1 - test/src/test_suite_runner.c3 | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30abc6c81..e009624e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,7 +95,7 @@ jobs: - name: run compiler tests run: | cd test - ..\build\${{ matrix.build_type }}\c3c.exe compile-run -O1 src/test_suite_runner.c3 --stdlib ..\lib7 --enable-new-generics -- ..\build\${{ matrix.build_type }}\c3c.exe test_suite7/ --stdlib ../lib7 + ..\build\${{ matrix.build_type }}\c3c.exe compile-run -O1 src/test_suite_runner.c3 --stdlib ..\lib7 --enable-new-generics -- ..\build\${{ matrix.build_type }}\c3c.exe test_suite7/ --stdlib ../lib7 --no-terminal - name: Test python script run: | @@ -169,7 +169,7 @@ jobs: run: | cd test ../build/c3c.exe compile --target windows-x64 -O1 src/test_suite_runner.c3 --stdlib ../lib7 --enable-new-generics - ./test_suite_runner.exe ../build/c3c.exe test_suite7/ --stdlib ../lib7 + ./test_suite_runner.exe ../build/c3c.exe test_suite7/ --stdlib ../lib7 --no-terminal build-msys2-clang: runs-on: windows-latest @@ -220,7 +220,7 @@ jobs: - name: run compiler tests run: | cd test - ../build/c3c.exe compile-run -O1 --stdlib ../lib7 src/test_suite_runner.c3 --enable-new-generics test_suite7/ --stdlib ../lib7 + ../build/c3c.exe compile-run -O1 --stdlib ../lib7 src/test_suite_runner.c3 --enable-new-generics test_suite7/ --stdlib ../lib7 --no-terminal build-linux: runs-on: ubuntu-22.04 diff --git a/lib/std/core/runtime_test.c3 b/lib/std/core/runtime_test.c3 index 123fa4552..ded27fb18 100644 --- a/lib/std/core/runtime_test.c3 +++ b/lib/std/core/runtime_test.c3 @@ -73,7 +73,6 @@ fn int cmp_test_unit(TestUnit a, TestUnit b) fn bool terminal_has_ansi_codes() @local => @pool() { - if (try v = env::get_var_temp("TERM")) { if (v.contains("xterm") || v.contains("vt100") || v.contains("screen")) return true; diff --git a/test/src/test_suite_runner.c3 b/test/src/test_suite_runner.c3 index ecf5ffd1e..aabf31de5 100644 --- a/test/src/test_suite_runner.c3 +++ b/test/src/test_suite_runner.c3 @@ -44,6 +44,8 @@ fn void main(String[] args) String arg = args[i]; switch (arg) { + case "--no-terminal": + print_to_file = true; case "-s": case "--skipped": only_skipped = true;