Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5332E196AB for ; Thu, 28 Apr 2016 16:29:25 +0000 (UTC) Received: (qmail 84960 invoked by uid 500); 28 Apr 2016 16:29:25 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 84934 invoked by uid 500); 28 Apr 2016 16:29:25 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 84914 invoked by uid 99); 28 Apr 2016 16:29:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Apr 2016 16:29:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F235DDFB8F; Thu, 28 Apr 2016 16:29:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: daserge@apache.org To: commits@cordova.apache.org Message-Id: <73b1b89e400144458744dc86f9507be8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: android commit: CB-11163 Android Builds are failing in CI Date: Thu, 28 Apr 2016 16:29:24 +0000 (UTC) Repository: cordova-android Updated Branches: refs/heads/master 8b9608157 -> 914e2fa35 CB-11163 Android Builds are failing in CI CB-11133 Handle android emulator start failure (reverted from commit abcaee24f9bd0e680f8d06ced5e0d363d63cffb7) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/914e2fa3 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/914e2fa3 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/914e2fa3 Branch: refs/heads/master Commit: 914e2fa35fa111a45ce6de7937e62ce97e29dcc8 Parents: 8b96081 Author: daserge Authored: Thu Apr 28 17:25:39 2016 +0300 Committer: daserge Committed: Thu Apr 28 17:25:39 2016 +0300 ---------------------------------------------------------------------- bin/templates/cordova/lib/emulator.js | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/914e2fa3/bin/templates/cordova/lib/emulator.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js index 9aa4816..bd85dcd 100644 --- a/bin/templates/cordova/lib/emulator.js +++ b/bin/templates/cordova/lib/emulator.js @@ -182,26 +182,9 @@ module.exports.start = function(emulator_ID, boot_timeout) { var uuidProp = 'emu.uuid=' + uuid; var args = ['-avd', emulatorId, '-prop', uuidProp]; // Don't wait for it to finish, since the emulator will probably keep running for a long time. - var emulatorProcess = child_process - .spawn('emulator', args, { detached: true }); - - emulatorProcess.stderr.on('data', function (data) { - throw new CordovaError(data); - }); - - emulatorProcess.stdout.on('data', function (data) { - if (/ERROR/.test(data)) { - throw new CordovaError(data); - } - }); - - emulatorProcess.on('exit', function(code) { - if (code !== 0) { - throw new CordovaError('Emulator process exited with code: ' + code); - } - }); - - emulatorProcess.unref(); + child_process + .spawn('emulator', args, { stdio: 'inherit', detached: true }) + .unref(); // wait for emulator to start events.emit('log', 'Waiting for emulator...'); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org