Skip to content

Commit

Permalink
Merge pull request #56 from johnwalker/macbuilds
Browse files Browse the repository at this point in the history
Add support for running tests on OSX and Windows
  • Loading branch information
johnwalker authored Dec 10, 2018
2 parents ed0112a + 33565ce commit c5956c6
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cleanup.sh
release.sh
target
.idea/
*.iml
44 changes: 27 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,26 @@
</dependency>

<dependency>
<groupId>com.almworks.sqlite4java</groupId>
<artifactId>sqlite4java</artifactId>
<version>${sqlite4java.version}</version>
<scope>test</scope>
<groupId>com.almworks.sqlite4java</groupId>
<artifactId>sqlite4java</artifactId>
<version>${sqlite4java.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.almworks.sqlite4java</groupId>
<artifactId>libsqlite4java-osx</artifactId>
<version>${sqlite4java.version}</version>
<type>dylib</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.almworks.sqlite4java</groupId>
<artifactId>sqlite4java-win32-x64</artifactId>
<version>${sqlite4java.version}</version>
<type>dll</type>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -143,21 +159,14 @@
<executions>
<execution>
<id>copy</id>
<phase>compile</phase>
<phase>test-compile</phase>
<goals>
<goal>copy</goal>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.almworks.sqlite4java</groupId>
<artifactId>libsqlite4java-linux-amd64</artifactId>
<version>${sqlite4java.version}</version>
<type>so</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
</artifactItem>
</artifactItems>
<includeScope>test</includeScope>
<includeTypes>so,dll,dylib</includeTypes>
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
</configuration>
</execution>
</executions>
Expand All @@ -166,8 +175,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.22.1</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<includes>
<include>**/Test*.java</include>
<include>**/*Test.java</include>
Expand Down

0 comments on commit c5956c6

Please sign in to comment.