summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-09-04 11:50:37 +0900
committerKazuhiro NISHIYAMA <zn@mbf.nifty.com>2019-09-04 11:50:37 +0900
commitb0d0b850bc61e158fb7caac4123af824b12938f1 (patch)
tree2d479d36c6c00fe63fce5f536264d6aac851a1ab
parentc14b67b2a8cf60b37cfb221d8b97c6eb91833522 (diff)
Use RUBY_TESTOPTS instead of TESTOPTS
https://github.com/ruby/ruby/pull/2417#issuecomment-526884646 > `TESTOPTS` is defaulted to `$(RUBY_TESTOPTS)` in `common.mk` file. > Use the latter name to pass options via an environment variable.
-rw-r--r--.github/workflows/macos.yml4
-rw-r--r--.github/workflows/ubuntu.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7718e019db..ee48db79c8 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -43,14 +43,14 @@ jobs:
- name: Tests
run: make -s ${{ matrix.test_task }}
env:
- TESTOPTS: "$JOBS -q --tty=no"
+ RUBY_TESTOPTS: "$JOBS -q --tty=no"
MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies
if: matrix.test_task != 'test-bundled-gems' && !contains(github.event.head_commit.message, '[ci skip]')
# test-bundled-gems is separated for marking `continue-on-error` because it randomly fails.
- name: Tests
run: make -s ${{ matrix.test_task }}
env:
- TESTOPTS: "$JOBS -q --tty=no"
+ RUBY_TESTOPTS: "$JOBS -q --tty=no"
continue-on-error: true
if: matrix.test_task == 'test-bundled-gems' && !contains(github.event.head_commit.message, '[ci skip]')
- name: Leaked Globals
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index e1cfa2d22f..a6ec9f9cf7 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -46,14 +46,14 @@ jobs:
- name: Tests
run: make -s ${{ matrix.test_task }}
env:
- TESTOPTS: "$JOBS -q --tty=no"
+ RUBY_TESTOPTS: "$JOBS -q --tty=no"
MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies
if: matrix.test_task != 'test-bundled-gems' && !contains(github.event.head_commit.message, '[ci skip]')
# test-bundled-gems is separated for marking `continue-on-error` because it randomly fails.
- name: Tests (test-bundled-gems)
run: make -s ${{ matrix.test_task }}
env:
- TESTOPTS: "-q --tty=no"
+ RUBY_TESTOPTS: "-q --tty=no"
continue-on-error: true
if: matrix.test_task == 'test-bundled-gems' && !contains(github.event.head_commit.message, '[ci skip]')
- name: Leaked Globals