1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify test tasks

Browse Source 
Removed `if` conditions separating `test-bundled-gems`, and pass
`TESTOPTS` and `TEST_BUNDLED_GEMS_ALLOW_FAILURES` via `env`.
This commit is contained in:
Nobuyoshi Nakada 2019-11-05 00:48:22 +09:00
parent 929a4aa722
commit c0c9a00f83
Notes: git 2019-11-05 02:12:52 +09:00 
Merged: https://github.com/ruby/ruby/pull/2643
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/macos.yml vendored
View File

@ -55,16 +55,12 @@ jobs:
- name: Make - name: Make
run: make -C build $JOBS run: make -C build $JOBS
- name: Tests - name: Tests
run: make -C build -s ${{ matrix.test_task }} TESTOPTS="$JOBS -q --tty=no" run: make -C build -s ${{ matrix.test_task }}
env: env:
MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies
if: matrix.test_task != 'test-bundled-gems'
- name: Tests (test-bundled-gems)
# Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
run: make -C build -s ${{ matrix.test_task }} TEST_BUNDLED_GEMS_ALLOW_FAILURES=minitest
env:
RUBY_TESTOPTS: "-q --tty=no" RUBY_TESTOPTS: "-q --tty=no"
if: matrix.test_task == 'test-bundled-gems' # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest"
- name: Leaked Globals - name: Leaked Globals
run: make -C build -s leaked-globals run: make -C build -s leaked-globals
- uses: k0kubun/action-slack@v2.0.0 - uses: k0kubun/action-slack@v2.0.0

10
.github/workflows/ubuntu.yml vendored
View File

@ -79,16 +79,12 @@ jobs:
- name: Make - name: Make
run: make -C build $JOBS run: make -C build $JOBS
- name: Tests - name: Tests
run: make -C build -s ${{ matrix.test_task }} TESTOPTS="$JOBS -q --tty=no" run: make -C build -s ${{ matrix.test_task }}
env: env:
MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies
if: matrix.test_task != 'test-bundled-gems'
- name: Tests (test-bundled-gems)
# Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
run: make -C build -s ${{ matrix.test_task }} TEST_BUNDLED_GEMS_ALLOW_FAILURES=minitest
env:
RUBY_TESTOPTS: "-q --tty=no" RUBY_TESTOPTS: "-q --tty=no"
if: matrix.test_task == 'test-bundled-gems' # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest"
- name: Leaked Globals - name: Leaked Globals
run: make -C build -s leaked-globals run: make -C build -s leaked-globals
- name: Debug GitHub context - name: Debug GitHub context