/hg/release/icedtea-web-1.4: Added support for chromium binary (...

[jvanek at icedtea.classpath.org]

changeset 4ad4b61198f6 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=4ad4b61198f6
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 20 17:31:22 2014 +0200

	Added support for chromium binary (along with older chromium-browser one)


diffstat:

 ChangeLog                                                               |   7 ++++
 tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java |  17 +++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (55 lines):

diff -r c4a622149b5c -r 4ad4b61198f6 ChangeLog
--- a/ChangeLog	Fri Oct 17 13:29:21 2014 +0200
+++ b/ChangeLog	Mon Oct 20 17:31:22 2014 +0200
@@ -1,3 +1,10 @@
+2014-10-20  Jiri Vanek  <jvanek at redhat.com>
+
+	Added support for chromium binary (along with older chromium-browser one)
+	* tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java:
+	(static) check if legacy chromium-browser do exists. If so use it, otherwise
+	use newer chromium only
+
 2014-10-17  Jiri Vanek  <jvanek at redhat.com>
 
 	Jacoco boot class loading moved from custom built to upstreamed form
diff -r c4a622149b5c -r 4ad4b61198f6 tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java
--- a/tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java	Fri Oct 17 13:29:21 2014 +0200
+++ b/tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java	Mon Oct 20 17:31:22 2014 +0200
@@ -37,6 +37,9 @@
 
 package net.sourceforge.jnlp.browsertesting;
 
+import java.io.File;
+import net.sourceforge.jnlp.browsertesting.browsers.LinuxBrowser;
+
 /**
  * When all represent all configured browser, one represens one random
  * (the first found) configured browser. Each other represents inidivdual browsers
@@ -46,6 +49,18 @@
 
    none, all, one, opera, googleChrome, chromiumBrowser, firefox, midori,epiphany;
 
+    public static final String CHROMIUM;
+
+    static {
+        final String def = "chromium";
+        final String alt = "chromium-browser";
+        if (new File(LinuxBrowser.DEFAULT_BIN_PATH, alt).exists()) {
+            CHROMIUM = alt;
+        } else {
+            CHROMIUM = def;
+        }
+    }
+
     public String toExec() {
         switch (this) {
             case opera:
@@ -53,7 +68,7 @@
             case googleChrome:
                 return "google-chrome";
             case chromiumBrowser:
-                return "chromium-browser";
+                return CHROMIUM;
             case firefox:
                 return "firefox";
             case midori: