Merge branch 'master' into harmony-v3.0.17

2017-06-15 19:01:36 +08:00
parent 100e18305d 57dc4fb32f
commit 78cf35f89c
7 changed files with 90 additions and 8 deletions
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -9,7 +9,7 @@ function read(path) {
 describe("bin/uglifyjs", function () {
    var uglifyjscmd = '"' + process.argv[0] + '" bin/uglifyjs';
    it("should produce a functional build when using --self", function (done) {
-        this.timeout(15000);
+        this.timeout(30000);

        var command = uglifyjscmd + ' --self -cm --wrap WrappedUglifyJS';