Browse Source

Using legacy test runner from amber-dev.

Herbert Vojčík 10 years ago
parent
commit
fd2628a64f
3 changed files with 7 additions and 6 deletions
  1. 2 1
      .gitignore
  2. 3 3
      Gruntfile.js
  3. 2 2
      package.json

+ 2 - 1
.gitignore

@@ -4,9 +4,10 @@ server/FileServer*.js
 # Ignoring Mac Finder files
 .DS_Store
 
-# Ignoring run.js in test/
+# Ignoring test runner
 test/amber_test_runner.js
 test/run.js
+test_runner.js
 
 # In case amber is also saved in a local Subversion
 .svn

+ 3 - 3
Gruntfile.js

@@ -67,15 +67,15 @@ module.exports = function(grunt) {
         src: ['src/Kernel-Tests.st', 'src/Compiler-Tests.st', 'src/SUnit-Tests.st'],
         libraries: ['SUnit']
       },
-      amber_test_runner: {
-        src: ['test/Test.st'],
+      test_runner: {
+        src: ['node_modules/amber-dev/lib/Test.st'],
         libraries: [
         'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
         'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser',
         'SUnit', 'Kernel-ImportExport',
         'Kernel-Tests', 'Compiler-Tests', 'SUnit-Tests'],
         main_class: 'NodeTestRunner',
-        output_name: 'test/amber_test_runner'
+        output_name: 'test_runner'
       }
     },
 

+ 2 - 2
package.json

@@ -26,12 +26,12 @@
     "node": ">=0.8.0"
   },
   "scripts": {
-    "test": "grunt amberc:amber_cli && ./bin/amber tests"
+    "test": "grunt amberc:test_runner && node test_runner.js && ( rm test_runner.js || del test_runner.js )"
   },
   "devDependencies": {
     "pegjs": "~0.8.0",
     "grunt": "~0.4.0",
     "grunt-contrib-jshint": "~0.3.0",
-    "amber-dev": "0.0.1"
+    "amber-dev": "0.0.2"
   }
 }