Mercurial > hg > release > icedtea-web-1.4
changeset 797:4ad4b61198f6
Added support for chromium binary (along with older chromium-browser one)
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Mon, 20 Oct 2014 17:31:22 +0200 |
| parents | c4a622149b5c |
| children | d27ef8e16953 |
| files | ChangeLog tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java |
| diffstat | 2 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@redhat.com> Jacoco boot class loading moved from custom built to upstreamed form
--- 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: