diff --git a/.travis.yml b/.travis.yml index 7dd5d5a..5abf964 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,9 @@ before_install: # Build cbmc-builder and try to build & test cbmc in it. Run in parallel for # each distro. env: - - DISTRO="alpine" - - DISTRO="ubuntu" + - IMAGE="alpine" + - IMAGE="ubuntu" + - IMAGE="alpine-diffblue-builder" script: - - BUILDER_TAG=$(git describe) ./dobi ${DISTRO}-test + - BUILDER_TAG=$(git describe) ./dobi ${IMAGE}-test diff --git a/alpine/Dockerfile.diffblue-builder b/alpine/Dockerfile.diffblue-builder new file mode 100644 index 0000000..cccfa86 --- /dev/null +++ b/alpine/Dockerfile.diffblue-builder @@ -0,0 +1,8 @@ +FROM diffblue/cbmc-builder:alpine-0.0.1 + +LABEL maintainer="DiffBlue Ltd." + +RUN apk add --no-cache openjdk8 jq maven apache-ant + +ENV PATH="$PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin" \ + JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" diff --git a/dobi.yaml b/dobi.yaml index ee86f1c..663d223 100644 --- a/dobi.yaml +++ b/dobi.yaml @@ -14,6 +14,10 @@ mount=source: bind: ./cbmc/ path: /src/cbmc/ +mount=test-java: + bind: ./test/java/ + path: /test-java/ + ## Alpine Mounts mount=alpine-tmp: @@ -57,6 +61,13 @@ image=alpine-distro: - 'alpine' - 'alpine-{env.BUILDER_TAG}' +image=alpine-diffblue-builder: + image: diffblue/diffblue-builder + dockerfile: alpine/Dockerfile.diffblue-builder + tags: + - 'alpine' + - 'alpine-{env.BUILDER_TAG}' + ## Ubuntu Images image=ubuntu-builder: @@ -128,6 +139,12 @@ job=alpine-clean: command: "bash -c \"rm -rf /tmp/projects/* && rm -rf /dist/*\"" description: "Delete temporary files and binaries" +job=alpine-diffblue-builder-test: + use: alpine-diffblue-builder + mounts: [test-java] + command: "bash -c \"cd /test-java && mvn compile && ant compile\"" + description: "Test basic funcionality" + ## Ubuntu Jobs job=ubuntu-copy-src: diff --git a/test/java/build.xml b/test/java/build.xml new file mode 100644 index 0000000..5286eb4 --- /dev/null +++ b/test/java/build.xml @@ -0,0 +1,17 @@ + + + Simple build file + + + + + + + + + + + + + diff --git a/test/java/pom.xml b/test/java/pom.xml new file mode 100644 index 0000000..a735303 --- /dev/null +++ b/test/java/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + + com.diffblue.regression + diffblue-regression-test + 1 + jar + + Diffblue Regression Test + + diff --git a/test/java/src/main/java/com/diffblue/regression/My.java b/test/java/src/main/java/com/diffblue/regression/My.java new file mode 100644 index 0000000..06af6a7 --- /dev/null +++ b/test/java/src/main/java/com/diffblue/regression/My.java @@ -0,0 +1,6 @@ +package com.diffblue.regression; + +public class My { + public My(int i) { + } +}