merge from dev

This commit is contained in:
daan 2020-09-06 09:09:55 -07:00
commit 803e6f9e46

View File

@ -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)