From 2d1b16b174921e53d1899822a8864532d8a06f46 Mon Sep 17 00:00:00 2001 From: Robo Date: Thu, 23 Aug 2018 01:07:22 +0530 Subject: [PATCH] build: [gn] fix node header generation target in appveyor (#14218) * build: [gn] fix node header generation target in appveyor * build: fix tests run on AppVeyor * build: [gn win] copy node.lib to node_headers on appveyor * Fix verify-ffmpeg paths --- appveyor-gn.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/appveyor-gn.yml b/appveyor-gn.yml index 79dfbfddb6aa..282c4952dfcb 100644 --- a/appveyor-gn.yml +++ b/appveyor-gn.yml @@ -35,14 +35,19 @@ build_script: - ninja -C out/ffmpeg third_party/ffmpeg - ninja -C out/Default electron:electron_dist_zip test_script: - - ninja -C out/Default electron/build/node:headers + - ninja -C out/Default third_party/electron_node:headers - ps: $env:npm_config_nodedir="$pwd/out/Default/gen/node_headers" - ps: $env:npm_config_msvs_version="2017" + - ps: >- + if ($env:gn_args -eq 'testing') { + New-Item .\out\Default\gen\node_headers\Release -Type directory + Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib + } - ps: Push-Location; cd electron/spec - npm install - ps: Pop-Location - - ./out/Default/electron.exe electron/spec --ci - - python src\electron\verify-ffmpeg.py -c Default --source-root "%pwd%\src" --ffmpeg-path "%pwd%\src\out\ffmpeg" + - .\out\Default\electron.exe electron\spec --ci + - python electron\verify-ffmpeg.py -c Default --source-root "%pwd%" --ffmpeg-path "%pwd%\out\ffmpeg" artifacts: - path: test-results.xml name: test-results.xml