jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

testament: change how JS tests are disable for travis on OSX

Browse source
This commit is contained in:
Andreas Rumpf 2018-08-13 12:51:19 +02:00
commit 81645deb87
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/testament/categories.nim
View file

@ -484,7 +484,9 @@ proc processCategory(r: var TResults, cat: Category, options: string) =
of "js": of "js":
# only run the JS tests on Windows or Linux because Travis is bad # only run the JS tests on Windows or Linux because Travis is bad
# and other OSes like Haiku might lack nodejs: # and other OSes like Haiku might lack nodejs:
when defined(linux) or defined(windows): if not defined(linux) and isTravis:
discard
else:
jsTests(r, cat, options) jsTests(r, cat, options)
of "dll": of "dll":
dllTests(r, cat, options) dllTests(r, cat, options)

4
tests/testament/specs.nim
View file

@ -12,8 +12,8 @@ import parseutils, strutils, os, osproc, streams, parsecfg
var compilerPrefix* = "compiler" / "nim " var compilerPrefix* = "compiler" / "nim "
let isTravis = existsEnv("TRAVIS") let isTravis* = existsEnv("TRAVIS")
let isAppVeyor = existsEnv("APPVEYOR") let isAppVeyor* = existsEnv("APPVEYOR")
proc cmdTemplate*(): string = proc cmdTemplate*(): string =
compilerPrefix & "$target --lib:lib --hints:on -d:testing $options $file" compilerPrefix & "$target --lib:lib --hints:on -d:testing $options $file"