diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2018-08-06 19:16:23 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2018-08-06 19:16:23 +0200 |
commit | 6c319d4f74514f7113dbca2bf07dacc3d932fd67 (patch) | |
tree | 28b8a1da1b6b9d17fbbf075c6b8cc59987253aa8 | |
parent | 559c4b8a200c89a2f530891b4720d16cfae412d6 (diff) | |
download | Nim-6c319d4f74514f7113dbca2bf07dacc3d932fd67.tar.gz |
travis/testament: disable JS tests on OSX
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | tests/testament/categories.nim | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 2896b126a..e9b76bf6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install boehmgc; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sfml; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install node@8; fi before_script: - set -e diff --git a/tests/testament/categories.nim b/tests/testament/categories.nim index 75da486dc..f7cd0815c 100644 --- a/tests/testament/categories.nim +++ b/tests/testament/categories.nim @@ -482,8 +482,10 @@ proc processCategory(r: var TResults, cat: Category, options: string) = compileRodFiles(r, cat, options) runRodFiles(r, cat, options) of "js": - # XXX JS doesn't need to be special anymore - jsTests(r, cat, options) + # only run the JS tests on Windows or Linux because Travis is bad + # and other OSes like Haiku might lack nodejs: + when defined(linux) or defined(windows): + jsTests(r, cat, options) of "dll": dllTests(r, cat, options) of "flags": |