Browse Source

Merge pull request #397 from mkroehnert/travis

Travis now works without the custom run_build.sh script
Nicolas Petton 11 years ago
parent
commit
f9ca0b1f7c
3 changed files with 7 additions and 8 deletions
  1. 1 2
      .travis.yml
  2. 1 1
      grunt.js
  3. 5 5
      package.json

+ 1 - 2
.travis.yml

@@ -1,4 +1,3 @@
 language: node_js
 node_js:
-  - 0.8
-script: ./test/run_build.sh
+  - 0.8

+ 1 - 1
grunt.js

@@ -83,7 +83,7 @@ module.exports = function(grunt) {
         'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser',
         'SUnit',
         'Kernel-Tests', 'Compiler-Tests', 'SUnit-Tests'],
-        output_name: 'run'
+        output_name: 'amber_test_runner'
       },
       amber_dev: {
         working_dir: 'js',

+ 5 - 5
package.json

@@ -23,12 +23,12 @@
         "ambers": "./bin/server"
     },
     "scripts": {
-        "test": "./test/run_build.sh"
+        "test": "./node_modules/grunt/bin/grunt amberc:amber_test_runner; node ./test/amber_test_runner.js"
     },
     "devDependencies": {
-      "pegjs": "~0.7.0",
-      "grunt": "~0.3.17",
-      "grunt-image-embed": "~0.1.3",
-      "grunt-contrib-mincss": "~0.3.2"
+        "pegjs": "~0.7.0",
+        "grunt": "~0.3.17",
+        "grunt-image-embed": "~0.1.3",
+        "grunt-contrib-mincss": "~0.3.2"
     }
 }