From bfaf3f458f956c09e8a06147090399c22e1795e8 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Fri, 21 Sep 2018 10:39:29 -0400
Subject: [PATCH] Make killall Electron more friendly

---
 vsts.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/vsts.yml b/vsts.yml
index 8fadcd303cad..59946e793c6d 100644
--- a/vsts.yml
+++ b/vsts.yml
@@ -131,6 +131,9 @@ jobs:
       mkdir -p src/out/ffmpeg
       git clone https://github.com/electron/electron src/electron
       (cd src/electron; git fetch origin +"${BUILD_SOURCEBRANCH}"; git checkout "${BUILD_SOURCEVERSION}")
+      cd src
+      export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+      echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]`pwd`/buildtools"
     displayName: Checkout Electron
 
   - task: DownloadBuildArtifacts@0
@@ -143,7 +146,7 @@ jobs:
     displayName: 'Download ffmpeg.dylib for testing'
     inputs:
       artifactName: ffmpeg
-      downloadPath: '$(System.DefaultWorkingDirectory)/src/out/ffmpeg'
+      downloadPath: '$(System.DefaultWorkingDirectory)/src/out'
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download Node.js headers'
@@ -157,8 +160,9 @@ jobs:
     displayName: Unzip Electron app
 
   - bash: |
-      set +e
-      killall Electron
+      if pgrep Electron; then
+        killall Electron
+      fi
     displayName: Make sure Electron isn't running from previous tests
 
   - bash: |