From f87f35d623bfa5449b370ef93d0d0f0b0a0a4cae Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Wed, 31 May 2017 17:18:12 +0200 Subject: [PATCH] chore(.travis.yml.in,script/test_registry): fix build --- .travis.yml | 19 ++++++++++--------- .travis.yml.in | 11 ++++++++++- script/test_registry.py | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-) mode change 100644 => 100755 script/test_registry.py diff --git a/.travis.yml b/.travis.yml index 54c32b82fb..a2f65c0326 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,13 @@ matrix: CMAKE_BUILD_TYPE=Release MULTI_THREAD=OFF + - os: linux + env: + CMAKE_CXX_COMPILER=g++-4.9 + CMAKE_BUILD_TYPE=Release + TEST=OFF + TEST_LEANPKG_REGISTRY=ON + - os: linux env: CMAKE_CXX_COMPILER=clang++-3.4 @@ -73,13 +80,6 @@ matrix: CMAKE_CXX_COMPILER=g++-4.9 CMAKE_BUILD_TYPE=Debug - - os: linux - dist: precise - env: - CMAKE_CXX_COMPILER=g++-4.9 - CMAKE_BUILD_TYPE=Debug - TEST_LEANPKG_REGISTRY=ON - - os: osx env: CMAKE_CXX_COMPILER=clang++ @@ -116,10 +116,11 @@ script: -DLEAN_EXTRA_MAKE_OPTS=$LEAN_EXTRA_MAKE_OPTS ../src || exit - make -j2 || exit + - export PATH="$TRAVIS_BUILD_DIR/bin:$PATH" - cpack - - yes "A" | ctest -j2 --output-on-failure + - if [[ $TEST != OFF ]]; then yes "A" | ctest -j2 --output-on-failure; fi - if [[ $PACKAGE == TRUE ]]; then make package; fi - - if [[ $TEST_LEANPKG_REGISTRY == ON ]]; then python ../script/test_registry.py; fi + - if [[ $TEST_LEANPKG_REGISTRY == ON ]]; then ../script/test_registry.py; fi - cd .. after_script: diff --git a/.travis.yml.in b/.travis.yml.in index 0bd08cb2ac..6e0883aee3 100644 --- a/.travis.yml.in +++ b/.travis.yml.in @@ -60,6 +60,13 @@ matrix: CMAKE_BUILD_TYPE=Release MULTI_THREAD=OFF + - os: linux + env: + CMAKE_CXX_COMPILER=g++-4.9 + CMAKE_BUILD_TYPE=Release + TEST=OFF + TEST_LEANPKG_REGISTRY=ON + - os: linux env: CMAKE_CXX_COMPILER=clang++-3.4 @@ -109,9 +116,11 @@ script: -DLEAN_EXTRA_MAKE_OPTS=$LEAN_EXTRA_MAKE_OPTS ../src || exit - make -j2 || exit + - export PATH="$TRAVIS_BUILD_DIR/bin:$PATH" - cpack - - yes "A" | ctest -j2 --output-on-failure + - if [[ $TEST != OFF ]]; then yes "A" | ctest -j2 --output-on-failure; fi - if [[ $PACKAGE == TRUE ]]; then make package; fi + - if [[ $TEST_LEANPKG_REGISTRY == ON ]]; then ../script/test_registry.py; fi - cd .. after_script: diff --git a/script/test_registry.py b/script/test_registry.py old mode 100644 new mode 100755 index 290423d7f4..28a4f40184 --- a/script/test_registry.py +++ b/script/test_registry.py @@ -1,6 +1,7 @@ +#!/usr/bin/env python3 + import json import os -import requests import subprocess def get_packages():