1
0
mirror of https://github.com/adobe/brackets.git synced 2024-11-20 01:42:55 +01:00

fix test-integration task on linux

This commit is contained in:
Jason San Jose 2013-09-17 15:21:48 -07:00
parent 816880b296
commit 1032262a40
5 changed files with 12 additions and 8 deletions

View File

@ -142,7 +142,8 @@ module.exports = function (grunt) {
shell: {
repo: grunt.option("shell-repo") || "../brackets-shell",
mac: "<%= shell.repo %>/installer/mac/staging/<%= pkg.name %>.app",
win: "<%= shell.repo %>/installer/win/staging/<%= pkg.name %>.exe"
win: "<%= shell.repo %>/installer/win/staging/<%= pkg.name %>.exe",
linux: "<%= shell.repo %>/installer/linux/debian/package-root/opt/brackets/brackets"
}
});

View File

@ -20,6 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*
*/
/*jslint nomen:true */
/*global module, require, process */
module.exports = function (grunt) {
"use strict";

View File

@ -43,10 +43,10 @@ module.exports = function (grunt) {
specRunnerPath = common.resolve("test/SpecRunner.html"),
args = " --startup-path=\"" + specRunnerPath + "?suite=" + encodeURIComponent(suite) + "&spec=" + encodeURIComponent(spec) + "&resultsPath=" + encodeURIComponent(resultsPath) + "\"";
if (platform === "win") {
cmd += args;
} else if (platform === "mac") {
if (platform === "mac") {
cmd = "open \"" + cmd + "\" -W --args " + args;
} else {
cmd += args;
}
grunt.log.writeln(cmd);

View File

@ -28,8 +28,10 @@
define(function (require, exports, module) {
'use strict';
// Don't run tests when running in browser
if (brackets.inBrowser) {
require("utils/Global");
// Don't run tests when running in browser or linux
if (brackets.inBrowser || brackets.platform === "linux") {
return;
}