kfr

commit 25ec282a82668e876e0d2cdec5d723dd16cc0bff
parent bd1ab6638df1138e68b3af0fbea4793f10b8c310
Author: [email protected] <[email protected]>
Date:   Sun, 22 Mar 2020 21:03:28 +0000

Use SDE for macOS

Diffstat:
M
azure-pipelines.yml
 | 
28
++++++++++++----------------
M
tests/CMakeLists.txt
 | 
12
++++++++----

2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -94,12 +94,8 @@ jobs:
     matrix:
       xcode11.1.2:
         XCODE_VER: 11.3.1
-      xcode11:
-        XCODE_VER: 11
       xcode10.3:
         XCODE_VER: 10.3
-      xcode10:
-        XCODE_VER: 10
       xcode9.4.1:
         XCODE_VER: 9.4.1
   pool:
@@ -107,20 +103,20 @@ jobs:
   steps:
   - bash: |
       set -e
+
+      curl -o "$(Agent.TempDirectory)/sde.tar.bz2" -L $(SDE_URL_MACOS)
+      mkdir -p "$(Agent.TempDirectory)/sde-bin"
+      tar -C "$(Agent.TempDirectory)/sde-bin" -xjf "$(Agent.TempDirectory)/sde.tar.bz2" --strip 1
+      export PATH=$PATH:$(Agent.TempDirectory)/sde-bin
+      sde64 -help || true
+
+      sudo spctl --master-disable
+      sudo /usr/sbin/DevToolsSecurity –enable
+      sudo security authorizationdb write system.privilege.taskport allow
+
       /bin/bash -c "sudo xcode-select -s /Applications/Xcode_$(XCODE_VER).app/Contents/Developer"
       brew install ninja
-      ci/run.sh build-release -DCPU_ARCH=detect -DCMAKE_BUILD_TYPE=Release      
-      
-- job: macOS_x86_64_Clang_Arch_Release
-  timeoutInMinutes: 120
-  pool:
-    vmImage: 'macOS-10.14'
-  steps:
-  - bash: |
-      set -e
-      /bin/bash -c "sudo xcode-select -s /Applications/Xcode_11.3.app/Contents/Developer"
-      brew install ninja
-      ci/run.sh build-release -DENABLE_CAPI_BUILD=ON -DARCH_TESTS=sse2,sse3,sse41,avx -DCMAKE_BUILD_TYPE=Release
+      ci/run.sh build-release -DENABLE_CAPI_BUILD=ON -DUSE_SDE=ON -DARCH_TESTS=sse2,sse3,sse41,avx,avx2,avx512 -DCMAKE_BUILD_TYPE=Release      
 
 - job: iOS_ARM_Clang_Release
   timeoutInMinutes: 120
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -205,8 +205,12 @@ if (ARCH_TESTS)
 endif ()
 
 if (USE_SDE)
-    find_program(SDE "sde")
-    find_program(EMULATOR "sde")
+    if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+        find_program(SDE NAMES "sde64" "sde")
+    else ()
+        find_program(SDE NAMES "sde")
+    endif ()
+    set(EMULATOR "${SDE}")
     list(APPEND EMULATOR "-skx")
     list(APPEND EMULATOR "--")
 elseif (NOT EMULATOR)
@@ -241,8 +245,8 @@ if (NOT SKIP_TESTS)
         foreach (A IN LISTS ARCH_LIST)
             if (USE_SDE)
                 add_test(NAME all_tests_${A}
-                         COMMAND ${SDE} ${SDE_ARCH_${A}} --
-                                 ${PROJECT_BINARY_DIR}/bin/all_tests_${A})
+                         COMMAND ${SDE} ${SDE_ARCH_${A}} -chip_check_exe_only
+                                 -- ${PROJECT_BINARY_DIR}/bin/all_tests_${A})
             else ()
                 add_test(NAME all_tests_${A}
                          COMMAND ${EMULATOR}