mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-11 20:39:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix tracetemplate detection logic and logging (fix #1386)

Browse Source
This commit is contained in:
Jonathan Lipps
2013-10-30 08:04:12 -07:00
parent 5b63fadfe8
commit 21e97dc959
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/devices/ios/ios.js
View File

@@ -321,23 +321,29 @@ IOS.prototype.setXcodeVersion = function(cb) {
};
IOS.prototype.detectTraceTemplate = function(cb) {
if (this.automationTraceTemplatePath === null) {
helpers.getXcodeFolder(function(res, xcodeFolderPath) {
var msg;
if (!this.automationTraceTemplatePath) {
helpers.getXcodeFolder(function(err, xcodeFolderPath) {
if (err) return cb(err);
if (xcodeFolderPath !== null) {
var xcodeTraceTemplatePath = path.resolve(xcodeFolderPath,
"../Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/" +
"../Applications/Instruments.app/Contents/PlugIns",
"AutomationInstrument.bundle/Contents/Resources",
"Automation.tracetemplate");
if (fs.existsSync(xcodeTraceTemplatePath)) {
this.automationTraceTemplatePath = xcodeTraceTemplatePath;
cb();
} else {
logger.error("Could not find Automation.tracetemplate in " + xcodeTraceTemplatePath);
cb(new Error("Could not find Automation.tracetemplate in " + xcodeTraceTemplatePath));
msg = "Could not find Automation.tracetemplate in " +
xcodeTraceTemplatePath;
logger.error(msg);
cb(new Error(msg));
}
} else {
logger.error("Could not find Automation.tracetemplate because XCode could not be found. " +
"Try setting the path with xcode-select.");
cb(new Error("Could not find Automation.tracetemplate because XCode could not be found."));
msg = "Could not find Automation.tracetemplate because XCode " +
"could not be found. Try setting the path with xcode-select.";
logger.error(msg);
cb(new Error(msg));
}
}.bind(this));
} else {