kfr

commit 7be1c7968e38d86675d23b2e85fb17fb34daae0e
parent eb8f56ced27697a24e80308d17344b476dcf3b0e
Author: [email protected] <[email protected]>
Date:   Thu,  7 Mar 2019 15:38:53 +0000

Add Android armv7 and aarch64 to Azure Pipelines

Diffstat:
M
CMakeLists.txt
 | 
1
+
M
azure-pipelines.yml
 | 
16
++++++++++++++++
M
tests/CMakeLists.txt
 | 
6
+++---

3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,6 +63,7 @@ option(ENABLE_ASMTEST "Enable writing disassembly" OFF)
 option(REGENERATE_TESTS "Regenerate auto tests" OFF)
 option(DISABLE_CLANG_EXTENSIONS "Disable Clang vector extensions" OFF)
 option(KFR_EXTENDED_TESTS "Extended tests (up to hour)" OFF)
+option(SKIP_TESTS "Skip tests (only build)" OFF)
 mark_as_advanced(ENABLE_ASMTEST)
 mark_as_advanced(REGENERATE_TESTS)
 mark_as_advanced(DISABLE_CLANG_EXTENSIONS)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -117,6 +117,22 @@ jobs:
       set PATH=%PATH:C:\Program Files\Git\mingw64\bin;=%
       ci\run.cmd build-debug -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang-cl.exe" -DCPU_ARCH=detect -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_BUILD_TYPE=Debug
 
+- job: Android_ARMv7_Clang_Release
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - script: |
+      choco install ninja
+      ci\run.cmd build-release -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=TRUE -DSKIP_TESTS=ON -DCMAKE_BUILD_TYPE=Release
+
+- job: Android_AARCH64_Clang_Release
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - script: |
+      choco install ninja
+      ci\run.cmd build-release -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_NEON=TRUE -DSKIP_TESTS=ON -DCMAKE_BUILD_TYPE=Release
+
 - job: Windows_MinGW_x86_64_AVX512_Clang_Release
   pool: WIN-AVX512
   steps:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -42,7 +42,7 @@ if (ENABLE_ASMTEST)
     add_custom_command(TARGET asm_test POST_BUILD COMMAND objconv -fyasm $<TARGET_FILE:asm_test>)
 endif()
 
-if (NOT ARM)
+if (X86)
     if(MSVC AND NOT CLANG)
         add_executable(multiarch multiarch.cpp multiarch_fir_sse2.cpp multiarch_fir_avx.cpp)
         set_source_files_properties(multiarch_fir_sse2.cpp PROPERTIES COMPILE_FLAGS /arch:SSE2)
@@ -159,10 +159,10 @@ else ()
     set(EMULATOR "")
 endif ()
 
-if (NOT IOS)
+if (NOT SKIP_TESTS)
     enable_testing()
 
-    if (NOT ARM)
+    if (X86)
         add_test(NAME multiarch
                 COMMAND ${EMULATOR} ${PROJECT_BINARY_DIR}/bin/multiarch)
     endif ()