From 4becfb659cefc47516aa10e9524c047cf7d85e96 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Thu, 10 Jan 2019 11:04:45 +0000 Subject: [PATCH] CI: re-jig appveyor msvc/arm tests again. --- appveyor.yml | 7 ++++--- test/null_runner.bat | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 test/null_runner.bat diff --git a/appveyor.yml b/appveyor.yml index e43cb82..689fdd8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,7 +42,8 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 ARGS: --toolset=msvc-14.1 address-model=32 cxxflags=-clr asynch-exceptions=on - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - ARGS: --toolset=msvc-14.1 architecture=arm testing.launcher=../../type_traits/test/null_runner.bat + ARGS: --toolset=msvc-14.1 architecture=arm testing.execute=off + DISABLE_CONFIG_INFO: "YES" - ARGS: --toolset=gcc address-model=64 PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% - ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z @@ -83,7 +84,7 @@ build: off test_script: - cd libs\config\test - - ..\..\..\b2 config_info_travis_install %ARGS% - - config_info_travis + - IF DEFINED DISABLE_CONFIG_INFO (echo skipping config_info build) ELSE (..\..\..\b2 config_info_travis_install %ARGS%) + - IF DEFINED DISABLE_CONFIG_INFO (echo skipping config_info printout) ELSE (config_info_travis) - cd ..\..\type_traits\test - ..\..\..\b2 -j3 --hash %ARGS% diff --git a/test/null_runner.bat b/test/null_runner.bat deleted file mode 100644 index af0df74..0000000 --- a/test/null_runner.bat +++ /dev/null @@ -1,4 +0,0 @@ -REM -REM This batch file does nothing, use it to "run" something that has been cross-compiled. -REM -ECHO Skipping running program %1%