# HG changeset patch # User Jiri Vanek # Date 1413819008 -7200 # Node ID 0c38ee32f2adc594d58b0980d67867670fca1487 # Parent 406f306e3380a1f6df3ae4a0066ff9b6ea1a7a81 Added support for chromium binary (along with older chromium-browser one) diff -r 406f306e3380 -r 0c38ee32f2ad ChangeLog --- a/ChangeLog Fri Oct 17 13:28:42 2014 +0200 +++ b/ChangeLog Mon Oct 20 17:30:08 2014 +0200 @@ -1,3 +1,10 @@ +2014-10-20 Jiri Vanek + + 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 Jacoco boot class loading moved from custom built to upstreamed form diff -r 406f306e3380 -r 0c38ee32f2ad tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java --- a/tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java Fri Oct 17 13:28:42 2014 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java Mon Oct 20 17:30:08 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: