diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-08-11 21:52:38 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-08-12 11:19:10 +0900 |
commit | 46c428a926b00f09b8e50dcd0366422d695e15c8 (patch) | |
tree | 6ea624248b4905ea8b7e5a488cd657cc54784dc6 | |
parent | 2c9fbc51005c15600c03b4dc2f545eabd67734b9 (diff) |
Make test-spec on Windows silent a little
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/8210
-rw-r--r-- | .appveyor.yml | 4 | ||||
-rw-r--r-- | .github/workflows/windows.yml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 2762a5759c..fdab2008e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -103,7 +103,7 @@ for: # separately execute tests without -j which may crash worker with -j. - >- nmake -l - "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" + "TESTOPTS=--timeout-scale=3.0 --excludes=../test/excludes/_appveyor" TESTS=" ../test/win32ole ../test/ruby/test_bignum.rb @@ -111,7 +111,7 @@ for: ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb " test-all - - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows + - nmake -l test-spec # not using `-j` because sometimes `mspec -j` silently dies on Windows notifications: - provider: Webhook method: POST diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 74975ca694..49e2ce5738 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -129,8 +129,10 @@ jobs: :vcset set | C:\msys64\usr\bin\sort > old.env call %VCVARS% + nmake -f nul set TMP=%USERPROFILE%\AppData\Local\Temp set TEMP=%USERPROFILE%\AppData\Local\Temp + set MAKEFLAGS=l set /a TEST_JOBS=(15 * %NUMBER_OF_PROCESSORS% / 10) > nul set | C:\msys64\usr\bin\sort > new.env C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV% @@ -162,7 +164,7 @@ jobs: - run: nmake test timeout-minutes: 5 - - run: nmake test-spec MSPECOPT="-V -fspec" + - run: nmake test-spec timeout-minutes: 10 - run: nmake test-all |