Merge branch 'devel' of github.com:nim-lang/Nim into devel

This commit is contained in:
Andreas Rumpf 2016-03-01 23:25:58 +01:00
commit 180a4b7657
6 changed files with 49 additions and 34 deletions

View file

@ -223,7 +223,7 @@ proc jsTests(r: var TResults, cat: Category, options: string) =
"varres/tvartup", "misc/tints", "misc/tunsignedinc"]:
test "tests/" & testfile & ".nim"
for testfile in ["pure/strutils"]:
for testfile in ["pure/strutils", "pure/json"]:
test "lib/" & testfile & ".nim"
# ------------------------- manyloc -------------------------------------------