Merge remote-tracking branch 'github/master' into sonarcloud-config

Conflicts:
	edelta.parent/edelta.swtbot.tests/pom.xml

.travis.yml

@@ -12,9 +12,10 @@ matrix:
       jdk: oraclejdk8
       env: DISPLAY=:99.0 ADDITIONAL="-Pjacoco,build-ide,test-ide coveralls:report sonar:sonar"
     # only on PR
-    # - os: osx
-    #  osx_image: xcode8
-    #  if: type IN (pull_request)
+    - os: osx
+      osx_image: xcode8.3
+      env: ADDITIONAL="-Pbuild-ide,test-ide"
+      if: type IN (pull_request)
 
 addons:
   sonarcloud:

edelta.parent/edelta.swtbot.tests/pom.xml

@@ -15,6 +15,7 @@
 
   <properties>
     <test-work-directory>${project.build.directory}/work/edelta</test-work-directory>
+    <os-jvm-flags />
     <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 -->
     <sonar.sources></sonar.sources>
     <sonar.tests>src</sonar.tests>
@@ -32,6 +33,7 @@
         <!-- Tycho surefire should install additional bundles in the actual 
           installation directory of the unpacked Eclipse; for Mac it is different: -->
         <test-work-directory>${project.build.directory}/work/edelta.app/Contents/Eclipse/</test-work-directory>
+        <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
       </properties>
     </profile>
   </profiles>
@@ -45,7 +47,7 @@
           <configuration>
             <useUIHarness>true</useUIHarness>
             <useUIThread>false</useUIThread>
-            <argLine>-Dorg.eclipse.swtbot.search.timeout=10000</argLine>
+            <argLine>${os-jvm-flags} -Dorg.eclipse.swtbot.search.timeout=10000</argLine>
             <testRuntime>p2Installed</testRuntime>
             <work>${test-work-directory}</work>
           </configuration>

travis_build.sh

@@ -4,7 +4,7 @@ set -ev
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
 	if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
 		echo "Build on MacOSX: Pull Request"
-		mvn -f edelta.parent/pom.xml clean verify
+		mvn -f edelta.parent/pom.xml clean verify $ADDITIONAL -Dtycho.disableP2Mirrors=true
 	else
 		echo "Skipping build on MacOSX for standard commit"
 	fi