arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

MacOS tests fix: new way of discovering work dir conflicts with tests execution. Fixed.

Browse Source
This commit is contained in:
Federico Fissore
2015-02-03 17:00:51 +01:00
parent eaf4db5da8
commit 7adaba5630
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.xml
View File

@ -103,6 +103,7 @@
<junit printsummary="yes" dir="${work.dir}" fork="true"> <junit printsummary="yes" dir="${work.dir}" fork="true">
<jvmarg value="-Djava.library.path=${java.additional.library.path}"/> <jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
<jvmarg value="-DWORK_DIR=."/>
<classpath> <classpath>
<pathelement location="bin"/> <pathelement location="bin"/>
<pathelement location="test-bin"/> <pathelement location="test-bin"/>

12
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -168,10 +168,14 @@ public class BaseNoGui {
File path = new File(System.getProperty("user.dir")); File path = new File(System.getProperty("user.dir"));
if (OSUtils.isMacOS()) { if (OSUtils.isMacOS()) {
try { if (System.getProperty("WORK_DIR") != null) {
path = new File(BaseNoGui.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()).getParentFile(); path = new File(System.getProperty("WORK_DIR"));
} catch (URISyntaxException e) { } else {
throw new RuntimeException(e); try {
path = new File(BaseNoGui.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()).getParentFile();
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
} }
} }