Permalink
Browse files

Update Makefile and tests for node

  • Loading branch information...
1 parent 486116b commit 7bb5920b6a9c42784c0ba0cf336ccc1b0cc55f9b @zaach committed Mar 30, 2011
Showing with 15 additions and 9 deletions.
  1. +11 −5 Makefile
  2. +1 −1 tests/harmony-tests.js
  3. +2 −2 tests/js-tests.js
  4. +1 −1 tests/objj-tests.js
View
16 Makefile
@@ -1,7 +1,7 @@
all: build test
-build: build-js build-objj build-harmony
-test: test-js test-objj test-harmony
+build: build-js build-objj build-harmony build-experimental
+test: test-js test-objj test-harmony test-experimental
build-js:
jison lib/js/grammar.jiy lib/js/lexer.jil
@@ -12,10 +12,16 @@ build-objj:
build-harmony:
jison lib/harmony/grammar.jiy lib/harmony/lexer.jil
mv grammar.js lib/harmony/parser.js
+build-experimental:
+ jison lib/experimental/grammar.jiy lib/experimental/lexer.jil
+ mv grammar.js lib/experimental/parser.js
test-js:
- narwhal tests/js-tests.js
+ node tests/js-tests.js
test-objj:
- narwhal tests/objj-tests.js
+ node tests/objj-tests.js
test-harmony:
- narwhal tests/harmony-tests.js
+ node tests/harmony-tests.js
+test-experimental:
+ node tests/experimental-tests.js
+
View
2 tests/harmony-tests.js
@@ -6,4 +6,4 @@ exports.testCodegen = require("./codegen/codegen-tests");
exports.testHarmonyCodegen = require("./harmony/codegen/codegen-tests");
if (require.main === module)
- require("os").exit(require("test").run(exports));
+ require("test").run(exports);
View
4 tests/js-tests.js
@@ -3,5 +3,5 @@ exports.testParser = require("./parser/parser-tests");
exports.testCodegen = require("./codegen/codegen-tests");
exports.testCallbacks = require("./callbacks");
-if (require.main === module)
- require("os").exit(require("test").run(exports));
+if (typeof process != 'undefined' || require.main === module)
+ require("test").run(exports);
View
2 tests/objj-tests.js
@@ -6,4 +6,4 @@ exports.testCodegen = require("./codegen/codegen-tests");
exports.testObjJCodegen = require("./objj/codegen/codegen-tests");
if (require.main === module)
- require("os").exit(require("test").run(exports));
+ require("test").run(exports);

0 comments on commit 7bb5920

Please sign in to comment.