From e2ae9f3125b9e45025858f700e967b22a8033bce Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Sun, 6 Sep 2020 09:14:32 -0700
Subject: [PATCH] fix pipeline script for macOS

---
 azure-pipelines.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a25fa3a7..4ce98c50 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -129,20 +129,16 @@ 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
-    workingDirectory: $(BuildType)
-    displayName: TestAPI
-  - script: MIMALLOC_VERBOSE=1 ./mimalloc-test-stress
-    workingDirectory: $(BuildType)
-    displayName: TestStress    
-=======
+  # - script: MIMALLOC_VERBOSE=1 ./mimalloc-test-api
+  #   workingDirectory: $(BuildType)
+  #   displayName: TestAPI
+  # - 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)