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

Author: Federico Fissore

app/build.xml

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

arduino-core/src/processing/app/BaseNoGui.java

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