summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorYuriy Glukhov <yuriy.glukhov@gmail.com>2016-09-03 22:46:10 +0300
committerYuriy Glukhov <yuriy.glukhov@gmail.com>2016-09-03 22:46:10 +0300
commita994f142b5f47e36dc5bea8335ba0148b017bbb5 (patch)
treecdf7653ffeeab47cafeaeba302fca54e3f392a24
parentc43a7f3980ecd19ed78966f60d076af6ff2e420d (diff)
downloadNim-a994f142b5f47e36dc5bea8335ba0148b017bbb5.tar.gz
Enabled logging tests for js
-rw-r--r--lib/pure/logging.nim9
-rw-r--r--tests/testament/categories.nim4
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/pure/logging.nim b/lib/pure/logging.nim
index ad5c34e95..b23b1e5bb 100644
--- a/lib/pure/logging.nim
+++ b/lib/pure/logging.nim
@@ -336,10 +336,11 @@ proc getLogFilter*(): Level =
 
 when not defined(testing) and isMainModule:
   var L = newConsoleLogger()
-  var fL = newFileLogger("test.log", fmtStr = verboseFmtStr)
-  var rL = newRollingFileLogger("rolling.log", fmtStr = verboseFmtStr)
+  when not defined(js):
+    var fL = newFileLogger("test.log", fmtStr = verboseFmtStr)
+    var rL = newRollingFileLogger("rolling.log", fmtStr = verboseFmtStr)
+    addHandler(fL)
+    addHandler(rL)
   addHandler(L)
-  addHandler(fL)
-  addHandler(rL)
   for i in 0 .. 25:
     info("hello", i)
diff --git a/tests/testament/categories.nim b/tests/testament/categories.nim
index 29b6d9aba..eaf000f86 100644
--- a/tests/testament/categories.nim
+++ b/tests/testament/categories.nim
@@ -228,8 +228,8 @@ proc jsTests(r: var TResults, cat: Category, options: string) =
                    "varres/tvartup", "misc/tints", "misc/tunsignedinc"]:
     test "tests/" & testfile & ".nim"
 
-  for testfile in ["pure/strutils", "pure/json", "pure/random", "pure/times"]:
-    test "lib/" & testfile & ".nim"
+  for testfile in ["strutils", "json", "random", "times", "logging"]:
+    test "lib/pure/" & testfile & ".nim"
 
 # ------------------------- manyloc -------------------------------------------
 #proc runSpecialTests(r: var TResults, options: string) =