Merge branch 'master' of github.com:Araq/Nimrod

tests/js.html

@@ -5,14 +5,14 @@
 <!--  This has been written by hand. (c) 2010 Andreas Rumpf -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Nimrod ECMAScript Generator Test</title>
+<title>Nimrod JavaScript Generator Test</title>
 <style type="text/css">
 span.DecNumber {color: blue}
 </style>
-<script src="nimcache/ecmas.js" type="text/javascript"></script>
+<script src="nimcache/js.js" type="text/javascript"></script>
 </head>
 <body onload="OnLoad()">
-<form name="form1" action="ecmas.html">
+<form name="form1" action="js.html">
   <input type="text" name="input1" size="10" />
   <input type="button" value="Calculate square" onclick="OnButtonClick()" />
 </form>

tests/js.nim

@@ -2,7 +2,7 @@ discard """
   cmd: "nimrod js --hints:on $# $#"
 """
 
-# This file tests the ECMAScript generator
+# This file tests the JavaScript generator
 
 import
   dom, strutils

tests/js/test1.nim

@@ -3,7 +3,7 @@ discard """
   output: "1261129"
 """
 
-# This file tests the ECMAScript generator
+# This file tests the JavaScript generator
 
 import
   dom, strutils

tests/js/tunittests.nim

@@ -0,0 +1,5 @@
+import unittest
+
+suite "Bacon":
+  test ">:)":
+    check(true == true)

tests/tester.nim

@@ -392,7 +392,7 @@ proc main() =
   of "compile":
     compile(r, "tests/compile/t*.nim", p.cmdLineRest.string)
     compile(r, "tests/ccg/t*.nim", p.cmdLineRest.string)
-    compile(r, "tests/ecmas.nim", p.cmdLineRest.string)
+    compile(r, "tests/js.nim", p.cmdLineRest.string)
     compileExample(r, "lib/pure/*.nim", p.cmdLineRest.string)
     compileExample(r, "examples/*.nim", p.cmdLineRest.string)
     compileExample(r, "examples/gtk/*.nim", p.cmdLineRest.string)