Fix Appveyor tests
Formatting
This commit is contained in:
parent
b49acb3aa8
commit
710d078824
@ -88,7 +88,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|||||||
set(PEDANTIC_COMPILE_FLAGS -Weverything -Wpedantic
|
set(PEDANTIC_COMPILE_FLAGS -Weverything -Wpedantic
|
||||||
-Wno-weak-vtables -Wno-padded -Wno-gnu-statement-expression
|
-Wno-weak-vtables -Wno-padded -Wno-gnu-statement-expression
|
||||||
-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-reserved-id-macro
|
-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-reserved-id-macro
|
||||||
-Wno-global-constructors -Wno-disabled-macro-expansion)
|
-Wno-global-constructors -Wno-disabled-macro-expansion
|
||||||
|
-Wno-switch-enum -Wno-documentation-unknown-command
|
||||||
|
-Wno-gnu-string-literal-operator-template)
|
||||||
|
|
||||||
set(WERROR_FLAG -Werror)
|
set(WERROR_FLAG -Werror)
|
||||||
endif ()
|
endif ()
|
||||||
|
|||||||
@ -77,9 +77,16 @@
|
|||||||
|
|
||||||
#if FMT_CLANG_VERSION && !FMT_ICC_VERSION
|
#if FMT_CLANG_VERSION && !FMT_ICC_VERSION
|
||||||
# pragma clang diagnostic push
|
# pragma clang diagnostic push
|
||||||
|
# pragma clang diagnostic ignored "-Wswitch-enum"
|
||||||
|
# pragma clang diagnostic ignored "-Wweak-vtables"
|
||||||
|
# pragma clang diagnostic ignored "-Wpadded"
|
||||||
|
# pragma clang diagnostic ignored "-Wgnu-statement-expression"
|
||||||
|
# pragma clang diagnostic ignored "-Wc++98-compat"
|
||||||
|
# pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
|
||||||
|
# pragma clang diagnostic ignored "-Wglobal-constructors"
|
||||||
|
# pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
|
||||||
# pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
|
# pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
|
||||||
# pragma clang diagnostic ignored "-Wgnu-string-literal-operator-template"
|
# pragma clang diagnostic ignored "-Wgnu-string-literal-operator-template"
|
||||||
# pragma clang diagnostic ignored "-Wswitch-enum"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "core.h"
|
#include "core.h"
|
||||||
|
|||||||
@ -19,7 +19,8 @@ environment:
|
|||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- image: Visual Studio 2013
|
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
|
||||||
|
CMAKE_GENERATOR: Visual Studio 12 2013
|
||||||
|
|
||||||
init:
|
init:
|
||||||
- ps: |
|
- ps: |
|
||||||
@ -28,12 +29,10 @@ init:
|
|||||||
}
|
}
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
# Workaround for CMake not wanting sh.exe on PATH for MinGW.
|
- mkdir build
|
||||||
- ps: |
|
- cd build
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
|
|
||||||
cmake -G "$($env:CMAKE_GENERATOR)$($env:CMAKE_GENERATOR_SUFFIX)" -DFMT_WERROR=OFF -DFMT_PEDANTIC=ON -DCMAKE_BUILD_TYPE=$env:CONFIGURATION ..
|
- ps: cmake -G "$($env:CMAKE_GENERATOR)$($env:CMAKE_GENERATOR_SUFFIX)" -DFMT_WERROR=OFF -DFMT_PEDANTIC=ON -DCMAKE_BUILD_TYPE=Debug ..
|
||||||
|
|
||||||
build:
|
build:
|
||||||
project: C:\projects\fmt\build\fmt.sln
|
project: C:\projects\fmt\build\fmt.sln
|
||||||
@ -42,8 +41,14 @@ build:
|
|||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- ps: |
|
- ps: |
|
||||||
cd build
|
New-Item .\DartConfiguration.tcl -ItemType file
|
||||||
ctest -C $env:CONFIGURATION
|
ctest -C Debug -T Test
|
||||||
|
$XSLInputElement = New-Object System.Xml.Xsl.XslCompiledTransform
|
||||||
|
$XslInputElement.Load("https://raw.githubusercontent.com/rpavlik/jenkins-ctest-plugin/master/ctest-to-junit.xsl")
|
||||||
|
$file = $(ls Testing\*\Test.xml) | Select -first 1
|
||||||
|
$XSLInputElement.Transform((Resolve-Path $file), (Join-Path (Resolve-Path .) "ctest-to-junit-results.xml"))
|
||||||
|
$wc = New-Object 'System.Net.WebClient'
|
||||||
|
$wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\ctest-to-junit-results.xml))
|
||||||
|
|
||||||
on_failure:
|
on_failure:
|
||||||
- appveyor PushArtifact Testing/Temporary/LastTest.log
|
- appveyor PushArtifact Testing/Temporary/LastTest.log
|
||||||
|
|||||||
@ -86,7 +86,7 @@ test_build_dir = os.path.join(fmt_dir, "_build_test")
|
|||||||
# Configure library.
|
# Configure library.
|
||||||
makedirs_if_not_exist(build_dir)
|
makedirs_if_not_exist(build_dir)
|
||||||
common_cmake_flags = [
|
common_cmake_flags = [
|
||||||
'-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build,
|
'-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build
|
||||||
]
|
]
|
||||||
extra_cmake_flags = []
|
extra_cmake_flags = []
|
||||||
if standard != '14':
|
if standard != '14':
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user