You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/05/22 07:53:59 UTC
svn commit: r1680996 - in /directory/studio/trunk:
features/rcp.feature/feature.xml tests/test.integration.ui/pom.xml
Author: seelmann
Date: Fri May 22 05:53:58 2015
New Revision: 1680996
URL: http://svn.apache.org/r1680996
Log:
Add jdt launching plugin for MacOSX to be able to launch ApacheDS. Also make SWTBot tests working on OSX
Modified:
directory/studio/trunk/features/rcp.feature/feature.xml
directory/studio/trunk/tests/test.integration.ui/pom.xml
Modified: directory/studio/trunk/features/rcp.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/rcp.feature/feature.xml?rev=1680996&r1=1680995&r2=1680996&view=diff
==============================================================================
--- directory/studio/trunk/features/rcp.feature/feature.xml (original)
+++ directory/studio/trunk/features/rcp.feature/feature.xml Fri May 22 05:53:58 2015
@@ -319,6 +319,14 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
+ id="org.eclipse.jdt.launching.macosx"
+ os="macosx"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jdt.core"
download-size="0"
install-size="0"
Modified: directory/studio/trunk/tests/test.integration.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom.xml?rev=1680996&r1=1680995&r2=1680996&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom.xml Fri May 22 05:53:58 2015
@@ -38,6 +38,7 @@
-->
<properties>
<skip-ui-tests>true</skip-ui-tests>
+ <os-jvm-flags/>
</properties>
<profiles>
@@ -52,7 +53,15 @@
<skip-ui-tests>false</skip-ui-tests>
</properties>
</profile>
- <!-- TODO: for Mac VM args -XstartOnFirstThread may be required -->
+ <profile>
+ <id>macosx-jvm-flags</id>
+ <activation>
+ <os><family>mac</family></os>
+ </activation>
+ <properties>
+ <os-jvm-flags>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</os-jvm-flags>
+ </properties>
+ </profile>
</profiles>
@@ -70,8 +79,8 @@
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
- <type>eclipse-plugin</type>
- <id>org.apache.directory.studio.slf4j-eclipselog</id>
+ <type>eclipse-feature</type>
+ <id>org.apache.directory.studio.rcp.feature</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
@@ -101,6 +110,7 @@
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<appArgLine>-nl en -debug debugoptions</appArgLine>
+ <argLine>${os-jvm-flags}</argLine>
<!-- TODO: Run tests in Studio RCP app only, or in full IDE, or both? -->
<!-- <product>org.eclipse.sdk.ide</product> -->
<!-- <application>org.eclipse.ui.ide.workbench</application> -->