Skip to content

Commit 4cd5047

Browse files
author
Benjamin Pasero
committed
build 💄
1 parent e5db2c3 commit 4cd5047

6 files changed

Lines changed: 21 additions & 7 deletions

File tree

‎build/azure-pipelines/darwin/product-build-darwin.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ steps:
102102
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
103103

104104
- script: |
105+
# Figure out the full absolute path of the product we just built
106+
# including the remote server and configure the integration tests
107+
# to run with these builds instead of running out of sources.
105108
set -e
106109
APP_ROOT=$(agent.builddirectory)/VSCode-darwin
107110
APP_NAME="`ls $APP_ROOT | head -n 1`"

‎build/azure-pipelines/linux/product-build-linux.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ steps:
105105
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
106106

107107
- script: |
108+
# Figure out the full absolute path of the product we just built
109+
# including the remote server and configure the integration tests
110+
# to run with these builds instead of running out of sources.
108111
set -e
109112
APP_ROOT=$(agent.builddirectory)/VSCode-linux-x64
110113
APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")

‎build/azure-pipelines/win32/product-build-win32.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ steps:
113113
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
114114

115115
- powershell: |
116+
# Figure out the full absolute path of the product we just built
117+
# including the remote server and configure the integration tests
118+
# to run with these builds instead of running out of sources.
116119
. build/azure-pipelines/win32/exec.ps1
117120
$ErrorActionPreference = "Stop"
118121
$AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"

‎extensions/vscode-test-resolver/src/extension.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export function activate(context: vscode.ExtensionContext) {
9191
extHostProcess = cp.spawn(serverCommandPath, commandArgs, { env, cwd: vscodePath });
9292
} else {
9393
const serverCommand = process.platform === 'win32' ? 'server.cmd' : 'server.sh';
94-
let serverLocation = env['VSCODE_REMOTE_SERVER_PATH']; // support environment
94+
let serverLocation = env['VSCODE_REMOTE_SERVER_PATH']; // support environment variable to specify location of server on disk
9595
if (!serverLocation) {
9696
const serverBin = path.join(remoteDataDir, 'bin');
9797
progress.report({ message: 'Installing VSCode Server' });

‎scripts/test-integration.bat‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ pushd %~dp0\..
55

66
set VSCODEUSERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,5%
77

8+
:: Figure out which Electron to use for running tests
89
if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
9-
:: code.bat makes sure Test Extensions are compiled
10+
:: Run out of sources: no need to compile as code.sh takes care of it
1011
set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
12+
13+
echo "Running integration tests out of sources."
1114
) else (
12-
:: Compile Test Extensions
15+
:: Run from a built: need to compile all test extensions
1316
call yarn gulp compile-extension:vscode-api-tests
1417
call yarn gulp compile-extension:vscode-colorize-tests
1518
call yarn gulp compile-extension:markdown-language-features
@@ -18,7 +21,7 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
1821
call yarn gulp compile-extension:html-language-features-server
1922
call yarn gulp compile-extension:json-language-features-server
2023

21-
echo "Using %INTEGRATION_TEST_ELECTRON_PATH% as Electron path"
24+
echo "Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build."
2225
)
2326

2427
:: Integration & performance tests in AMD

‎scripts/test-integration.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ cd $ROOT
1515
# Figure out which Electron to use for running tests
1616
if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ]
1717
then
18-
# code.sh makes sure Test Extensions are compiled
18+
# Run out of sources: no need to compile as code.sh takes care of it
1919
INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh"
20+
21+
echo "Running integration tests out of sources."
2022
else
21-
# Compile Test Extensions
23+
# Run from a built: need to compile all test extensions
2224
yarn gulp compile-extension:vscode-api-tests
2325
yarn gulp compile-extension:vscode-colorize-tests
2426
yarn gulp compile-extension:markdown-language-features
@@ -27,7 +29,7 @@ else
2729
yarn gulp compile-extension:html-language-features-server
2830
yarn gulp compile-extension:json-language-features-server
2931

30-
echo "Using $INTEGRATION_TEST_ELECTRON_PATH as Electron path"
32+
echo "Running integration tests with '$INTEGRATION_TEST_ELECTRON_PATH' as build."
3133
fi
3234

3335
# Integration tests in AMD

0 commit comments

Comments
 (0)