Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
Fixing failing AERI tests #1977
Browse files Browse the repository at this point in the history 
   - remove dependency of 32 bit libs
   - update jacoco version to 0.8.2
   - upstream bug causing aeri tests to fail

Signed-off-by: Ondrej Dockal <odockal@redhat.com>
  • Loading branch information
@odockal @jkopriva
odockal authored and jkopriva committed Dec 4, 2018
1 parent d4889f5 commit 2880041
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 17 deletions.
27 changes: 10 additions & 17 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Java Code Coverage -->
<jacoco-version>0.7.9</jacoco-version>
<jacoco-version>0.8.2</jacoco-version>
<!-- Sonar Properties -->
<sonar.code.codeCoveragePlugin>jacoco</sonar.code.codeCoveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.reportPaths>../../tests/org.eclipse.reddeer.common.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.core.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.direct.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.eclipse.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.gef.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.graphiti.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.jface.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.junit.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.requirements.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.swt.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.ui.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.uiforms.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.workbench.test/target/jacoco.exec</sonar.jacoco.reportPaths>
<sonar.jacoco.reportPaths>../../tests/org.eclipse.reddeer.common.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.core.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.direct.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.eclipse.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.gef.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.graphiti.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.jface.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.junit.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.requirements.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.swt.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.ui.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.uiforms.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.workbench.test/target/jacoco.exec,../../tests/org.eclipse.reddeer.e4.workbench.test/target/jacoco.exec</sonar.jacoco.reportPaths>
</properties>

<modules>
Expand Down Expand Up @@ -97,36 +97,26 @@
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
</environments>
<dependency-resolution>
<extraRequirements>
<requirement>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.equinox.ds</id>
<versionRange>1.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
<!-- source for bundles -->
Expand Down Expand Up @@ -169,6 +159,9 @@
<includes>
<include>org.eclipse.reddeer.*</include>
</includes>
<excludes>
<exclude>org.eclipse.reddeer.e4.workbench.core/**/*</exclude>
</excludes>
</configuration>
</execution>
</executions>
Expand Down
16 changes: 16 additions & 0 deletions tests/org.eclipse.reddeer.eclipse.test/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,20 @@
id="org.eclipse.reddeer.eclipse.test.jdt.ui.TestingPreferencePage"
name="Testing preference page"/>
</extension>
<extension
point="org.eclipse.epp.logging.aeri.ide.servers">
<server
id="org.eclipse.reddeer"
class="org.eclipse.epp.internal.logging.aeri.ide.server.mars.ServerConnection"
icon16="resources/icons/reddeer_icon.png"
icon32="resources/icons/reddeer_icon.png"
name="Eclipse RedDeer Test Connector"
description="Eclipse RedDeer connector description">
<link
href="https://github.com/eclipse/reddeer"
rel="provider"
title="RedDeer link">
</link>
</server>
</extension>
</plugin>

0 comments on commit 2880041

Please sign in to comment.