From afd9dd07e4adc71acda82ce2361cb01782c7de5d Mon Sep 17 00:00:00 2001
From: Nicolas Oliver <dario.n.oliver@intel.com>
Date: Mon, 29 May 2017 12:29:20 -0700
Subject: [PATCH] Dockerfile,docker-compose.yaml: run tests for every target

Signed-off-by: Nicolas Oliver <dario.n.oliver@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 Dockerfile          |  1 -
 docker-compose.yaml | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 97cc1398..503369ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,6 @@ ENV NVM_DIR /root/.nvm
 RUN . $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use $NODE_VERSION && \
     npm install -g node-gyp && node-gyp install
 
-
 # Set Workdir
 WORKDIR /usr/src/app
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 056d1938..ca1f1a4b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,14 +2,6 @@ version: '2'
 
 services:
 
-  ubuntu:
-    image: ubuntu:16.04
-    command: bash
-    environment:
-      - http_proxy
-      - https_proxy
-      - no_proxy
-
   main:
     build:
       context: .
@@ -55,11 +47,11 @@ services:
     build:
       args:
         - BUILDSWIGPYTHON=ON
-    command: bash -c "make $$(make help | grep _pyupm_.*-python2 | sed 's/... //' | tr '\n' ' ')"
+    command: bash -c "make $$(make help | grep _pyupm_.*-python2 | sed 's/... //' | tr '\n' ' ') && make test"
 
   python3:
     extends: python2
-    command: bash -c "make $$(make help | grep _pyupm_.*-python3 | sed 's/... //' | tr '\n' ' ')"
+    command: bash -c "make $$(make help | grep _pyupm_.*-python3 | sed 's/... //' | tr '\n' ' ') && make test"
 
   java:
     extends: main
@@ -68,7 +60,7 @@ services:
         - BUILDSWIGJAVA=ON
         - CC=gcc-4.8
         - CXX=g++-4.8
-    command: bash -c "make $$(make help | grep javaupm | sed 's/... //' | tr '\n' ' ')"
+    command: bash -c "make $$(make help | grep javaupm | sed 's/... //' | tr '\n' ' ') && make test"
 
   node4:
     extends: main
@@ -76,7 +68,7 @@ services:
       args:
         - BUILDSWIGNODE=ON
         - NODE_VERSION=v4.1.2
-    command: bash -c "make $$(make help | grep jsupm | sed 's/... //' | tr '\n' ' ')"
+    command: bash -c "make $$(make help | grep jsupm | sed 's/... //' | tr '\n' ' ') && make test"
 
   node5:
     extends: node4