diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js index 7ea81f3ce5..45fee2cae9 100644 --- a/gulp/tasks/test.js +++ b/gulp/tasks/test.js @@ -23,13 +23,12 @@ THE SOFTWARE. ****************************************************************************/ -const GEN_SOURCE_MAPS = false; +const UGLIFY = false; 'use strict'; const Path = require('path'); const Fs = require('fs'); -const Del = require('del'); const Source = require('vinyl-source-stream'); const Gulp = require('gulp'); const Fb = require('gulp-fb'); @@ -46,10 +45,10 @@ const Minify = Composer(Uglify, console); const Utils = require('../util/utils'); const createBundler = require('../util/create-bundler'); -exports.build = function (sourceFile, outputFile, sourceFileForExtends, outputFileForExtends, callback) { +exports.build = function (sourceFile, outputFile, sourceFileForExtends, outputFileForExtends, sourcemaps, callback) { var cacheDir = Path.resolve(Path.dirname(outputFile), '.cache/test-compile-cache'); var engine = createBundler(sourceFile, { - sourcemaps: GEN_SOURCE_MAPS, + sourcemaps: sourcemaps, cacheDir: cacheDir }) .bundle() @@ -58,19 +57,21 @@ exports.build = function (sourceFile, outputFile, sourceFileForExtends, outputFi .pipe(Source(Path.basename(outputFile))) .pipe(Buffer()); - if (GEN_SOURCE_MAPS) { - engine = engine.pipe(Sourcemaps.init({loadMaps: true})); - } + if (UGLIFY) { + if (sourcemaps) { + engine = engine.pipe(Sourcemaps.init({loadMaps: true})); + } - // remove `..args` used in CC_JSB - engine = engine.pipe(Minify(Utils.getUglifyOptions('test', false, false))); + // remove `...args` used in CC_JSB + engine = engine.pipe(Minify(Utils.getUglifyOptions('test', false, false))); - if (GEN_SOURCE_MAPS) { - engine = engine.pipe(Sourcemaps.write('./', { - sourceRoot: '../', - includeContent: false, - addComment: true - })); + if (sourcemaps) { + engine = engine.pipe(Sourcemaps.write('./', { + sourceRoot: '../', + includeContent: false, + addComment: true + })); + } } engine = engine.pipe(Gulp.dest(Path.dirname(outputFile))); @@ -78,7 +79,7 @@ exports.build = function (sourceFile, outputFile, sourceFileForExtends, outputFi if (Fs.existsSync(sourceFileForExtends)) { var engineExtends = createBundler(sourceFileForExtends, { - sourcemaps: GEN_SOURCE_MAPS, + sourcemaps: sourcemaps, babelifyOpt: { presets: ['env'], ast: false, diff --git a/gulpfile.js b/gulpfile.js index 9571543768..1af5cec340 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -146,7 +146,12 @@ gulp.task('build-test-cases', ['clean-test-cases'], function (done) { gulp.task('build-test', ['clean-test', 'build-test-cases'], function (done) { Test.build('./index.js', './bin/cocos2d-js-for-test.js', '../editor/test-utils/engine-extends-entry.js', './bin/cocos2d-js-extends-for-test.js', - done); + false, done); +}); +gulp.task('build-test-sm', ['clean-test', 'build-test-cases'], function (done) { + Test.build('./index.js', './bin/cocos2d-js-for-test.js', + '../editor/test-utils/engine-extends-entry.js', './bin/cocos2d-js-extends-for-test.js', + true, done); }); gulp.task('unit-runner', ['build-test'], function (done) { diff --git a/test/qunit/run.sh b/test/qunit/run.sh index a62311dcdd..38785aed3d 100755 --- a/test/qunit/run.sh +++ b/test/qunit/run.sh @@ -1,6 +1,6 @@ #!/bin/bash echo Run unit tests in Chrome \(sh test/qunit/run.sh\) -echo \(You need to run \"gulp build-test\" before testing.\) +echo \(You need to run \"gulp build-test-sm\" before testing.\) echo sh test/qunit/run-helper.sh & node test/qunit/server.js