1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00

Bug 412057 - UI tests don't run on Mac Cocoa using Tycho build

Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
This commit is contained in:
Marc-Andre Laperle 2013-07-02 14:30:50 -04:00 committed by Marc-Andre Laperle
parent e404208cac
commit 718d7de48e
10 changed files with 35 additions and 8 deletions

View file

@ -32,6 +32,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>${base.ui.test.vmargs}</argLine>
<includes> <includes>
<include>**/AllAutotoolsTests.*</include> <include>**/AllAutotoolsTests.*</include>
</includes> </includes>

View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>-ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AllMakeUITests.*</include> <include>**/AllMakeUITests.*</include>
</includes> </includes>

View file

@ -33,7 +33,7 @@
<configuration> <configuration>
<!-- Yes, the managed build core tests use the UI harness. --> <!-- Yes, the managed build core tests use the UI harness. -->
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AllManagedBuildTests.*</include> <include>**/AllManagedBuildTests.*</include>
</includes> </includes>

View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AllManagedBuildUITests.*</include> <include>**/AllManagedBuildUITests.*</include>
</includes> </includes>

View file

@ -24,7 +24,7 @@
<configuration> <configuration>
<!-- Need UI harness for quick fix tests --> <!-- Need UI harness for quick fix tests -->
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>-ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

View file

@ -32,7 +32,8 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>-ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <!-- Core tests actually use eclipse.ui classes, see CProjectHelper -->
<argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

View file

@ -23,7 +23,6 @@
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories>--> </repositories>-->
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -32,7 +31,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>-ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AutomatedSuite.*</include> <include>**/AutomatedSuite.*</include>
</includes> </includes>

View file

@ -65,7 +65,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>-ea -Xms256m -Xmx512m -XX:MaxPermSize=256M ${gdbPathOption}</argLine> <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M ${gdbPathOption}</argLine>
<includes> <includes>
<include>**/AutomatedSuite.*</include> <include>**/AutomatedSuite.*</include>
</includes> </includes>

25
pom.xml
View file

@ -221,6 +221,31 @@
</repository> </repository>
</repositories> </repositories>
<profiles>
<profile>
<id>macosx</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<properties>
<base.ui.test.vmargs>-XstartOnFirstThread</base.ui.test.vmargs>
</properties>
</profile>
<profile>
<id>other-os</id>
<activation>
<os>
<family>!mac</family>
</os>
</activation>
<properties>
<base.ui.test.vmargs></base.ui.test.vmargs>
</properties>
</profile>
</profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View file

@ -32,6 +32,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>${base.ui.test.vmargs}</argLine>
<includes> <includes>
<include>**/TestsRunnerSuite.*</include> <include>**/TestsRunnerSuite.*</include>
</includes> </includes>