commit 3aeafed62477b5e73d9b7c9150bd06d81fc1c095 parent e595a51dc225f8216683a0a097b387028348888a Author: d.levin256@gmail.com <d.levin256@gmail.com> Date: Fri, 23 Nov 2018 06:30:27 +0000 Pass all arguments Diffstat:
| M | azure-pipelines.yml | | | 6 | +++--- |
| M | ci/run.sh | | | 4 | ++-- |
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml @@ -57,7 +57,7 @@ jobs: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set PATH=%PATH:C:\tools\mingw64\bin;=% set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% - ci\run.sh build-release -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" -DARCH_FLAGS=-mavx -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_BUILD_TYPE=Release + ci\run.cmd build-release -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" -DARCH_FLAGS=-mavx -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_BUILD_TYPE=Release - job: Windows_MSVC32 pool: @@ -68,11 +68,11 @@ jobs: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat" set PATH=%PATH:C:\tools\mingw64\bin;=% set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=% - ci\run.sh build-release -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" -DARCH_FLAGS=-mavx -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_BUILD_TYPE=Release + ci\run.cmd build-release -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" -DARCH_FLAGS=-mavx -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_BUILD_TYPE=Release - job: Windows_AVX512 pool: WIN-AVX512 steps: - script: | call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - ci\run.sh build-release -DARCH_TESTS=ON -DCMAKE_CXX_COMPILER="C:/LLVM/bin/clang-cl.exe" -DARCH_FLAGS="-mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl" -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_BUILD_TYPE=Release + ci\run.cmd build-release -DARCH_TESTS=ON -DCMAKE_CXX_COMPILER="C:/LLVM/bin/clang-cl.exe" -DARCH_FLAGS="-mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl" -DCMAKE_CXX_FLAGS=-m64 -DCMAKE_BUILD_TYPE=Release diff --git a/ci/run.sh b/ci/run.sh @@ -7,8 +7,8 @@ echo Preparing directories... rm -r $build_dir || true mkdir $build_dir pushd $build_dir -echo Running cmake -GNinja -DENABLE_TESTS=ON $@ .. -cmake -GNinja -DENABLE_TESTS=ON $@ .. +echo Running cmake -GNinja -DENABLE_TESTS=ON "$@" .. +cmake -GNinja -DENABLE_TESTS=ON "$@" .. echo Running ninja... ninja echo Running tests...