Merge pull request #2 from diffblue/feature/diffblue-builder

Feature/diffblue builder

Author: forejtv

.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

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"

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:

test/java/build.xml

@@ -0,0 +1,17 @@
+<project name="Regression test" default="dist" basedir=".">
+  <description>
+    Simple build file
+  </description>
+  <!-- set global properties for this build -->
+  <property name="src" location="src"/>
+  <property name="build" location="build"/>
+
+  <target name="init">
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init"
+        description="compile the source">
+    <javac srcdir="${src}" destdir="${build}"/>
+  </target>
+</project>

test/java/pom.xml

@@ -0,0 +1,13 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.diffblue.regression</groupId>
+  <artifactId>diffblue-regression-test</artifactId>
+  <version>1</version>
+  <packaging>jar</packaging>
+
+  <name>Diffblue Regression Test</name>
+
+</project>

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) {
+  } 
+}