Skip to content

Commit

Permalink
turn off func testing on win CI
Browse files Browse the repository at this point in the history
  • Loading branch information
robhrt7 committed Aug 16, 2015
1 parent 373aec3 commit 7c2d698
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
4 changes: 4 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@ module.exports = function(grunt) {
'test-func'
]);

grunt.registerTask('ci-post-run-win', [
'test'
]);

/*
*
* Utils
Expand Down
3 changes: 2 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ commander
.option('--html', 'Turn on HTML parser on app start (requires installed and enabled parser).')
.option('--test', 'Run app with tests.')
.option('--no-watch', 'Run with disabled watcher.')
.option('--post-grunt [string]', 'Define Grunt command to run after app start', 'ci-post-run')
.parse(process.argv);

global.commander = commander;
Expand Down Expand Up @@ -230,7 +231,7 @@ if (!module.parent) {
if (commander.test) {
var spawn = require('cross-spawn');

spawn('./node_modules/grunt-cli/bin/grunt', ['ci-post-run', '--port='+port], {stdio: 'inherit'})
spawn('./node_modules/grunt-cli/bin/grunt', [commander.postGrunt, '--port='+port], {stdio: 'inherit'})
.on('close', function (code) {
if (code === 0) {
log.info('Test successful');
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ before_test: "git clone https://github.com/sourcejs/init.git user"

test_script:
- node --version && npm --version
- ps: "npm run ci-test # PowerShell" # Pass comment to PS for easier debugging
- cmd: "npm run ci-test-nw" # Run without watch because of CI bug
- ps: "npm run ci-test-win # PowerShell" # Pass comment to PS for easier debugging
- cmd: "npm run ci-test-win" # Run without watch because of CI bug

matrix:
fast_finish: true
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"start": "node app",
"test": "grunt ci-pre-run && node app.js --test",
"ci-test": "grunt ci-pre-run && node app.js --test --log trace",
"ci-test-nw": "grunt ci-pre-run && node app.js --test --log trace --no-watch"
"ci-test-win": "grunt ci-pre-run && node app.js --post-grunt ci-post-run-win --test --log trace --no-watch"
},
"devDependencies": {
"assert": "~1.1.1",
Expand Down

0 comments on commit 7c2d698

Please sign in to comment.