Skip to content

Commit

Permalink
Merge pull request #66 from kevinpetersavage/travisswttest
Browse files Browse the repository at this point in the history
Trying using xvfb to run travis gui tests
  • Loading branch information
gerring committed Apr 26, 2016
2 parents a093ce4 + 7e9200d commit 0ec7796
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 22 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jdk:
before_install:
- chmod +x ./org.eclipse.richbeans.releng/build/commit-msg.sh
- bash ./org.eclipse.richbeans.releng/build/commit-msg.sh
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3 # give xvfb some time to start as per the travis docs

# Run maven. This happens automatically and adding it again makes the build longer.
script:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
package org.eclipse.richbeans.generator.test;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;

@RunWith(Suite.class)
@RunWith(org.junit.runners.Suite.class)
@SuiteClasses({ DialogTest.class, DoublyNestedExampleTest.class, GuiGeneratorTest.class, SimpleExampleTest.class,
UpdatingExampleTest.class })
public class AllGuiTests {
public class Suite {

}
20 changes: 1 addition & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
<version>${tycho-version}</version>
<configuration>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
Expand All @@ -77,16 +72,6 @@
<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>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
Expand All @@ -108,9 +93,6 @@
<configuration>
<testSourceDirectory>${basedir}/src</testSourceDirectory>
<testClassesDirectory>${basedir}/bin</testClassesDirectory>
<excludes>
<exclude>org/eclipse/richbeans/generator/**/Suite.java</exclude>
</excludes>
<includes>
<include>${test.includes}</include>
</includes>
Expand All @@ -133,4 +115,4 @@

</project>



0 comments on commit 0ec7796

Please sign in to comment.