Merge pull request diffblue#533 from diffblue/merge-models-20180803

Merge latest models library

Author: smowton

.travis.yml

@@ -87,6 +87,8 @@ jobs:
     # OS X using g++
     - stage: Test different OS/CXX/Flags
       os: osx
+      jdk: openjdk8
+      osx_image: xcode8.3
       sudo: false
       compiler: gcc
       cache: ccache
@@ -105,6 +107,8 @@ jobs:
     # OS X using clang++
     - stage: Test different OS/CXX/Flags
       os: osx
+      jdk: openjdk8
+      osx_image: xcode8.3
       sudo: false
       compiler: clang
       cache: ccache
@@ -251,4 +255,3 @@ notifications:
     on_start: never
     on_cancel: never
     on_error: always
-

benchmarks/LIBRARIES/models/.travis.yml

@@ -4,14 +4,6 @@ os: linux
 sudo: required
 dist: trusty
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-5
-      - elinks
-
 cache:
   directories:
   - "$HOME/google-cloud-sdk/"
@@ -34,7 +26,7 @@ before_install:
 
 install:
   # Check that modelling utilities are building and run unit tests
-  - mvn -f scripts/modelling-utils/pom.xml install
+  - mvn -f scripts/modelling-utils/pom.xml package
   # First build simple models.
   - cd model-simple
   - mvn package
@@ -43,7 +35,7 @@ install:
   - cd model
   - mvn package
   - cd modelTests
-  - gsutil cp gs://travis-artifacts/test-gen/${TEST_GEN_BUILD:-"latest-develop-ubuntu"}.tar.gz cbmc-testgen-latest.tar.gz
+  - gsutil cp gs://travis-artifacts/test-gen/${TEST_GEN_BUILD:-"latest-develop-static"}.tar.gz cbmc-testgen-latest.tar.gz
   - tar -zxvf cbmc-testgen-latest.tar.gz -C under_test
   - mv ../target/models.jar under_test
   - mv ../../model-simple/target/models-simple-overlay.jar under_test
@@ -53,8 +45,7 @@ install:
   - sudo apt-get update
   - sudo apt-get install gauge
   - gauge install java
-    # Temporarily disable html-report (installing this plugin might not be required anyway)
-    # gauge install html-report
+  - gauge install html-report
   - gauge config plugin_kill_timeout 20000
   - gauge telemetry off
   - export MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
@@ -69,20 +60,6 @@ before_cache:
     # Upgrade pyopenssl (signurl prereq) via pip
   - sudo pip install pyopenssl --upgrade
 
-  - |
-    # Save the html report
-    ( set -euo pipefail
-      if [[ -d reports/html-report ]]
-      then
-        REPORT_FILE=html-report-$(git describe --tags --always).tar.gz
-        tar -zcvf ${REPORT_FILE} reports/html-report
-        gsutil -h "Content-Disposition:attachment; filename=models-${TRAVIS_BUILD_NUMBER}-report.tar.gz" \
-          cp ${REPORT_FILE} gs://travis-artifacts/models-library/models-${TRAVIS_BUILD_NUMBER}-report.tar.gz
-        echo Link to html report:
-        echo "https://console.cloud.google.com/storage/browser/travis-artifacts/models-library?project=diffblue-cr&prefix=models-${TRAVIS_BUILD_NUMBER}"
-      fi
-    )
-
 after_success:
   - |
     set -euo pipefail
@@ -118,4 +95,3 @@ notifications:
     on_start: never
     on_cancel: never
     on_error: always
-    

benchmarks/LIBRARIES/models/model-simple/src/main/java/com/diffblue/annotation/PreferredConcreteImplementation.java

@@ -0,0 +1,13 @@
+package com.diffblue.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Documented
+@Target(ElementType.TYPE)
+public @interface PreferredConcreteImplementation {
+
+    Class<?> value();
+
+}