merge from dev

azure-pipelines.yml

@@ -13,7 +13,7 @@ jobs:
   displayName: Windows
   pool:
     vmImage:
-     windows-2019
+      windows-2019
   strategy:
     matrix:
       Debug:
@@ -38,9 +38,8 @@ jobs:
       solution: $(BuildType)/libmimalloc.sln
       configuration: '$(MSBuildConfiguration)'
       msbuildArguments: -m
-  - script: |
-      cd $(BuildType)
-      ctest --verbose --timeout 120
+  - script: ctest --verbose --timeout 120
+    workingDirectory: $(BuildType)
     displayName: CTest
   #- script: $(BuildType)\$(BuildType)\mimalloc-test-stress
   #  displayName: TestStress
@@ -130,6 +129,7 @@ jobs:
       cmakeArgs: .. $(cmakeExtraArgs)
   - script: make -j$(sysctl -n hw.ncpu) -C $(BuildType)
     displayName: Make
+<<<<<<< HEAD
   #- script: make test -C $(BuildType)
   #  displayName: CTest
   - script: MIMALLOC_VERBOSE=1 ./mimalloc-test-api
@@ -138,6 +138,11 @@ jobs:
   - script: MIMALLOC_VERBOSE=1 ./mimalloc-test-stress
     workingDirectory: $(BuildType)
     displayName: TestStress    
+=======
+  - script: ctest --verbose --timeout 120
+    workingDirectory: $(BuildType)
+    displayName: CTest
+>>>>>>> dev
 #  - upload: $(Build.SourcesDirectory)/$(BuildType)
 #    artifact: mimalloc-macos-$(BuildType)