From a658ea15736b2f7f5dd4f508ac7728f7ca93cdce Mon Sep 17 00:00:00 2001 From: Marcel Kinard Date: Thu, 25 Sep 2014 11:25:09 -0400 Subject: [PATCH 1/2] CB-7410 update the docs to match the actual title --- test/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/README.md b/test/README.md index 38d76a5b..6f636742 100755 --- a/test/README.md +++ b/test/README.md @@ -34,7 +34,7 @@ found at https://code.google.com/p/robotium/ and the jar should be put in the To run manually from command line: 0. Build by entering `ant debug install` -0. Run tests by clicking on "CordovaTest" icon on device +0. Run tests by clicking on "CordovaNativeTests" app icon on the device To run from Eclipse: From e31c911c3056f06ed936a40c27f5723d97ed4692 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Mon, 29 Sep 2014 10:15:37 -0400 Subject: [PATCH 2/2] CB-7634 Detect JAVA_HOME properly on Ubuntu --- bin/lib/check_reqs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js index a7410e99..e5275711 100644 --- a/bin/lib/check_reqs.js +++ b/bin/lib/check_reqs.js @@ -101,7 +101,8 @@ module.exports.check_java = function() { }); } else { // See if we can derive it from javac's location. - var maybeJavaHome = path.dirname(path.dirname(javacPath)); + // fs.realpathSync is require on Ubuntu, which symplinks from /usr/bin -> JDK + var maybeJavaHome = path.dirname(path.dirname(fs.realpathSync(javacPath))); if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) { process.env['JAVA_HOME'] = maybeJavaHome; } else {