Merge branch 'master' of github.com:max99x/emscripten

2 files changed, 11 insertions, 1 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 77aa0d4f..17403146 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -3786,6 +3786,15 @@ TT = %s
 
   del T # T is just a shape for the specific subclasses, we don't test it itself
 
+  class OtherTests(RunnerCore):
+    def test_eliminator(self):
+      coffee = path_from_root('tools', 'eliminator', 'node_modules', 'coffee-script', 'bin', 'coffee')
+      eliminator = path_from_root('tools', 'eliminator', 'eliminator.coffee')
+      input = open(path_from_root('tools', 'eliminator', 'eliminator-test.js')).read()
+      expected = open(path_from_root('tools', 'eliminator', 'eliminator-test-output.js')).read()
+      output = Popen([coffee, eliminator], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate(input)[0]
+      self.assertEquals(output, expected)
+
 else:
   # Benchmarks
 
diff --git a/tools/eliminator/eliminator-test-output.js b/tools/eliminator/eliminator-test-output.js
index 4c9224da..4ff8a965 100644
--- a/tools/eliminator/eliminator-test-output.js
+++ b/tools/eliminator/eliminator-test-output.js
@@ -37,6 +37,7 @@ var g = function(a1, a2) {
   var obj = {
     "quoted": 1,
     "doublequoted": 2,
-    unquoted: 3
+    unquoted: 3,
+    4: 5
   };
 };