From c1b8845a268e92d28d07a41024442ef3a35a02c9 Mon Sep 17 00:00:00 2001
From: Arnaud Botella <arnaud.botella@geode-solutions.com>
Date: 周一, 04 5月 2020 19:27:16 +0800
Subject: [PATCH] Install lccinspector with lccgen (#88)

---
 .travis.yml |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c2099b6..8cb17ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,37 @@
              - libboost-date-time-dev
      script: 
          - cmake --build . --target install
-         - src/inspector/lccinspector
-         - ctest -T memcheck        
+         - ctest -T memcheck
+   - os: linux
+     dist: bionic
+     name: "Ubuntu 18.04 - VM - set LCC_PROJECT_NAME"
+     env:
+     - VIRTUAL_ENV=VM
+     - CTEST_OUTPUT_ON_FAILURE=1
+     addons:
+        apt:
+          packages:
+             - cmake
+             - valgrind
+             - libssl-dev
+             - zlib1g-dev
+             - libboost-dev
+             - libboost-test-dev
+             - libboost-filesystem-dev
+             - libboost-iostreams-dev
+             - libboost-program-options-dev
+             - libboost-system-dev
+             - libboost-thread-dev
+             - libboost-date-time-dev
+     before_script:
+         - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DLCC_PROJECT_NAME=MYPROJECT ..
+     script: 
+         - cmake --build . --target install
+         - ctest -T memcheck    
    - os: linux
      dist: xenial
+     env:
+     - CTEST_OUTPUT_ON_FAILURE=1
      name: "Ubuntu 16.04 - Travis CI VM"
      addons:
         apt:
@@ -99,7 +126,7 @@
         - docker commit centos7_toconfigure centos7_configured
      script: 
         - docker run --name centos7_make -v `pwd`:/root/open-license-manager centos7_configured /bin/bash -c 
-            "cd /root/open-license-manager/build && make && make install && VIRTUAL_ENV=CONTAINER make test"
+            "cd /root/open-license-manager/build && make && make install && CTEST_OUTPUT_ON_FAILURE=1 VIRTUAL_ENV=CONTAINER make test"
    - os: linux
      dist: bionic
      name: "CentOS-8 Docker"
@@ -115,13 +142,13 @@
         - docker commit centos8_toconfigure centos8_configured
      script: 
         - docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \
-            "cd /root/open-license-manager/build && make && make install && src/inspector/lccinspector && VIRTUAL_ENV=DOCKER make test"
+            "cd /root/open-license-manager/build && make && make install && src/inspector/lccinspector && CTEST_OUTPUT_ON_FAILURE=1 VIRTUAL_ENV=DOCKER make test"
    - os: linux
      dist: bionic
      name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
      env:
-        - CTEST_OUTPUT_ON_FAILURE=1      
-        - WINEARCH=win64
+     - CTEST_OUTPUT_ON_FAILURE=1      
+     - WINEARCH=win64
      addons:
         apt:
           packages:
@@ -149,6 +176,8 @@
         - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist -DOPENSSL_ROOT_DIR=$PWD/openssl-1.0.2h-win64-mingw/ ..
    - os: windows
      name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
+     env:
+     - CTEST_OUTPUT_ON_FAILURE=1   
      cache:
          edge: true
          directories:
@@ -233,11 +262,11 @@
         on:
             branch: develop
 env:
-    - CTEST_OUTPUT_ON_FAILURE=1
+  - CTEST_OUTPUT_ON_FAILURE=1
 before_script:
-    - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
+  - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
 
 script: 
-    - cmake --build . --target install --config Release
-    - ctest -C Release
+  - cmake --build . --target install --config Release
+  - ctest -C Release
     
\ No newline at end of file

--
Gitblit v1.9.1