eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-08 07:54:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix running tests in macOS (#689)

Browse Source 
Co-authored-by: Zufar Fakhurtdinov <zufar.fakhurtdinov@delightex.com>
This commit is contained in:
zufarfakhurtdinov 2023-04-11 13:57:28 +03:00 committed by GitHub
parent 928a8631a8
commit e801ff5b10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java
View File

@ -250,7 +250,9 @@ public class TeaVMTestRunner extends Runner implements Filterable {
} }
private void addChromeCommand(List<String> params) { private void addChromeCommand(List<String> params) {
if (isWindows()) { if (isMacos()) {
params.add("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome");
} else if (isWindows()) {
params.add("cmd.exe"); params.add("cmd.exe");
params.add("start"); params.add("start");
params.add("/C"); params.add("/C");
@ -261,6 +263,10 @@ public class TeaVMTestRunner extends Runner implements Filterable {
} }
private void addFirefoxCommand(List<String> params) { private void addFirefoxCommand(List<String> params) {
if (isMacos()) {
params.add("/Applications/Firefox.app/Contents/MacOS/firefox");
return;
}
if (isWindows()) { if (isWindows()) {
params.add("cmd.exe"); params.add("cmd.exe");
params.add("/C"); params.add("/C");
@ -273,6 +279,10 @@ public class TeaVMTestRunner extends Runner implements Filterable {
return System.getProperty("os.name").toLowerCase().startsWith("windows"); return System.getProperty("os.name").toLowerCase().startsWith("windows");
} }
private boolean isMacos() {
return System.getProperty("os.name").toLowerCase().startsWith("mac");
}
private Process browserTemplate(String name, String url, BiConsumer<String, List<String>> paramsBuilder) { private Process browserTemplate(String name, String url, BiConsumer<String, List<String>> paramsBuilder) {
File temp; File temp;
try { try {