From 81645deb871d1ff869c0c7b289d8a851ee3b4214 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Mon, 13 Aug 2018 12:51:19 +0200
Subject: [PATCH] testament: change how JS tests are disable for travis on OSX

---
 tests/testament/categories.nim | 4 +++-
 tests/testament/specs.nim      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/testament/categories.nim b/tests/testament/categories.nim
index f7cd0815c..8731848cf 100644
--- a/tests/testament/categories.nim
+++ b/tests/testament/categories.nim
@@ -484,7 +484,9 @@ proc processCategory(r: var TResults, cat: Category, options: string) =
   of "js":
     # 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):
+    if not defined(linux) and isTravis:
+      discard
+    else:
       jsTests(r, cat, options)
   of "dll":
     dllTests(r, cat, options)
diff --git a/tests/testament/specs.nim b/tests/testament/specs.nim
index ac79e3942..fbe930a4f 100644
--- a/tests/testament/specs.nim
+++ b/tests/testament/specs.nim
@@ -12,8 +12,8 @@ import parseutils, strutils, os, osproc, streams, parsecfg
 
 var compilerPrefix* = "compiler" / "nim "
 
-let isTravis = existsEnv("TRAVIS")
-let isAppVeyor = existsEnv("APPVEYOR")
+let isTravis* = existsEnv("TRAVIS")
+let isAppVeyor* = existsEnv("APPVEYOR")
 
 proc cmdTemplate*(): string =
   compilerPrefix & "$target --lib:lib --hints:on -d:testing $options $file"