From a16372a6b05af1b62c9626edaf12cf9e531c9551 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 22 May 2016 01:19:52 -0400 Subject: [PATCH] disable windows tests again * appveyor too slow --- .appveyor.yml | 19 ++++++++----------- .travis.yml | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e4e25f23c..0fa043f1d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,16 +5,13 @@ build: environment: matrix: - - BUILD: 'Debug' - CONFIG: debug - SHADOW_BUILD_DIR: $(APPVEYOR_BUILD_FOLDER)\build_windows_debug +# - BUILD: 'Debug' +# CONFIG: debug +# SHADOW_BUILD_DIR: $(APPVEYOR_BUILD_FOLDER)\build_windows_debug - BUILD: 'Release' CONFIG: installer SHADOW_BUILD_DIR: $(APPVEYOR_BUILD_FOLDER)\build_windows_install -matrix: - fast_finish: true - install: - git submodule update --init --recursive - call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 @@ -34,13 +31,13 @@ build_script: - cd %SHADOW_BUILD_DIR% && jom - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\qgroundcontrol-installer.exe %APPVEYOR_BUILD_FOLDER%\qgroundcontrol-installer.exe ) # Generate the source server information to embed in the PDB - - if "%CONFIG%" EQU "installer" ( '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\srctool.exe" -r -u "%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb" | grep qgroundcontrol | grep -v moc_ | grep -v libs\\mavlink | grep -v build_windows_install | python %APPVEYOR_BUILD_FOLDER%\deploy\genPDBsrcsrv.py > %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv' ) + - '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\srctool.exe" -r -u "%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb" | grep qgroundcontrol | grep -v moc_ | grep -v libs\\mavlink | grep -v build_windows_install | python %APPVEYOR_BUILD_FOLDER%\deploy\genPDBsrcsrv.py > %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv' # write the source server info - - if "%CONFIG%" EQU "installer" ( '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\pdbstr.exe" -w -i:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv -p:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb -s:srcsrv' ) + - '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\pdbstr.exe" -w -i:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv -p:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb -s:srcsrv' # build the symbol / PE store - - if "%CONFIG%" EQU "installer" ( 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb /t qgroundcontrol' ) - - if "%CONFIG%" EQU "installer" ( 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.exe /t qgroundcontrol' ) - - ps: if($env:CONFIG -eq 'installer') { cd $env:appveyor_build_folder; .\deploy\lowercaseify_symbolstore.ps1 } + - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb /t qgroundcontrol' + - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.exe /t qgroundcontrol' + - ps: 'cd $env:appveyor_build_folder; .\deploy\lowercaseify_symbolstore.ps1' test_script: - if "%CONFIG%" EQU "debug" ( %SHADOW_BUILD_DIR%\debug\qgroundcontrol --unittest ) diff --git a/.travis.yml b/.travis.yml index 46d9e1cea..561b2474f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp git: - depth: 500 + depth: 1000 env: global: @@ -13,7 +13,7 @@ matrix: fast_finish: true include: - os: linux - env: SPEC=linux-g++-64 CONFIG=debug + env: SPEC=linux-g++-64 CONFIG=debug QT_FATAL_WARNINGS=1 sudo: required dist: trusty - os: linux -- 2.22.0