mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-13 17:22:15 -05:00
Merge vscode source through 1.62 release (#19981)
* Build breaks 1 * Build breaks * Build breaks * Build breaks * More build breaks * Build breaks (#2512) * Runtime breaks * Build breaks * Fix dialog location break * Update typescript * Fix ASAR break issue * Unit test breaks * Update distro * Fix breaks in ADO builds (#2513) * Bump to node 16 * Fix hygiene errors * Bump distro * Remove reference to node type * Delete vscode specific extension * Bump to node 16 in CI yaml * Skip integration tests in CI builds (while fixing) * yarn.lock update * Bump moment dependency in remote yarn * Fix drop-down chevron style * Bump to node 16 * Remove playwrite from ci.yaml * Skip building build scripts in hygine check
This commit is contained in:
Karl Burtram
87
resources/server/bin-dev/code-web.js
Normal file
87
resources/server/bin-dev/code-web.js
Normal file
@@ -0,0 +1,87 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
// @ts-check
|
||||
|
||||
const cp = require('child_process');
|
||||
const path = require('path');
|
||||
const os = require('os');
|
||||
|
||||
const serverArgs = [];
|
||||
|
||||
// Server Config
|
||||
let PORT = 9888;
|
||||
let DRIVER = undefined;
|
||||
let LOGS_PATH = undefined;
|
||||
|
||||
// Workspace Config
|
||||
let FOLDER = undefined;
|
||||
let WORKSPACE = undefined;
|
||||
|
||||
// Settings Sync Config
|
||||
let GITHUB_AUTH_TOKEN = undefined;
|
||||
let ENABLE_SYNC = false;
|
||||
|
||||
for (let idx = 0; idx <= process.argv.length - 2; idx++) {
|
||||
const arg = process.argv[idx];
|
||||
switch (arg) {
|
||||
case '--port': PORT = Number(process.argv[idx + 1]); break;
|
||||
case '--folder': FOLDER = process.argv[idx + 1]; break;
|
||||
case '--workspace': WORKSPACE = process.argv[idx + 1]; break;
|
||||
case '--driver': DRIVER = process.argv[idx + 1]; break;
|
||||
case '--github-auth': GITHUB_AUTH_TOKEN = process.argv[idx + 1]; break;
|
||||
case '--logsPath': LOGS_PATH = process.argv[idx + 1]; break;
|
||||
case '--enable-sync': ENABLE_SYNC = true; break;
|
||||
}
|
||||
}
|
||||
|
||||
serverArgs.push('--port', String(PORT));
|
||||
if (FOLDER) {
|
||||
serverArgs.push('--folder', FOLDER);
|
||||
}
|
||||
if (WORKSPACE) {
|
||||
serverArgs.push('--workspace', WORKSPACE);
|
||||
}
|
||||
if (DRIVER) {
|
||||
serverArgs.push('--driver', DRIVER);
|
||||
|
||||
// given a DRIVER, we auto-shutdown when tests are done
|
||||
serverArgs.push('--enable-remote-auto-shutdown', '--remote-auto-shutdown-without-delay');
|
||||
}
|
||||
if (LOGS_PATH) {
|
||||
serverArgs.push('--logsPath', LOGS_PATH);
|
||||
}
|
||||
if (GITHUB_AUTH_TOKEN) {
|
||||
serverArgs.push('--github-auth', GITHUB_AUTH_TOKEN);
|
||||
}
|
||||
if (ENABLE_SYNC) {
|
||||
serverArgs.push('--enable-sync', true);
|
||||
}
|
||||
|
||||
// Connection Token
|
||||
serverArgs.push('--connectionToken', '00000');
|
||||
|
||||
// Server should really only listen from localhost
|
||||
serverArgs.push('--host', '127.0.0.1');
|
||||
|
||||
const env = { ...process.env };
|
||||
env['VSCODE_AGENT_FOLDER'] = env['VSCODE_AGENT_FOLDER'] || path.join(os.homedir(), '.vscode-web-dev');
|
||||
const entryPoint = path.join(__dirname, '..', '..', '..', 'out', 'vs', 'server', 'main.js');
|
||||
|
||||
startServer();
|
||||
|
||||
function startServer() {
|
||||
const proc = cp.spawn(process.execPath, [entryPoint, ...serverArgs], { env });
|
||||
|
||||
proc.stdout.on('data', data => {
|
||||
// Log everything
|
||||
console.log(data.toString());
|
||||
});
|
||||
|
||||
// Log errors
|
||||
proc.stderr.on('data', data => {
|
||||
console.error(data.toString());
|
||||
});
|
||||
}
|
||||
6
resources/server/bin-dev/code.cmd
Normal file
6
resources/server/bin-dev/code.cmd
Normal file
@@ -0,0 +1,6 @@
|
||||
@echo off
|
||||
setlocal
|
||||
SET VSCODE_PATH=%~dp0..\..\..
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`where /r "%VSCODE_PATH%\.build\node" node.exe`) do (SET "NODE=%%g")
|
||||
call "%NODE%" "%VSCODE_PATH%\out\vs\server\cli.js" "Code Server - Dev" "" "" "code.cmd" %*
|
||||
endlocal
|
||||
18
resources/server/bin-dev/code.sh
Executable file
18
resources/server/bin-dev/code.sh
Executable file
@@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
#
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
|
||||
VSCODE_PATH=$(dirname $(dirname $(dirname $(dirname $(realpath "$0")))))
|
||||
else
|
||||
VSCODE_PATH=$(dirname $(dirname $(dirname $(dirname $(readlink -f $0)))))
|
||||
fi
|
||||
|
||||
PROD_NAME="Code Server - Dev"
|
||||
VERSION=""
|
||||
COMMIT=""
|
||||
EXEC_NAME="$(basename "$(test -L "$0" && readlink "$0" || echo "$0")")"
|
||||
CLI_SCRIPT="$VSCODE_PATH/out/vs/server/cli.js"
|
||||
node "$CLI_SCRIPT" "$PROD_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "$@"
|
||||
6
resources/server/bin-dev/helpers/browser.cmd
Normal file
6
resources/server/bin-dev/helpers/browser.cmd
Normal file
@@ -0,0 +1,6 @@
|
||||
@echo off
|
||||
setlocal
|
||||
SET VSCODE_PATH=%~dp0..\..\..\..
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`where /r "%VSCODE_PATH%\.build\node" node.exe`) do (SET "NODE=%%g")
|
||||
call "%NODE%" "%VSCODE_PATH%\out\vs\server\cli.js" "Code Server - Dev" "" "" "code.cmd" "--openExternal" %*
|
||||
endlocal
|
||||
18
resources/server/bin-dev/helpers/browser.sh
Executable file
18
resources/server/bin-dev/helpers/browser.sh
Executable file
@@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
#
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
|
||||
VSCODE_PATH=$(dirname $(dirname $(dirname $(dirname $(dirname $(realpath "$0"))))))
|
||||
else
|
||||
VSCODE_PATH=$(dirname $(dirname $(dirname $(dirname $(dirname $(readlink -f $0))))))
|
||||
fi
|
||||
|
||||
PROD_NAME="Code Server - Dev"
|
||||
VERSION=""
|
||||
COMMIT=""
|
||||
EXEC_NAME=""
|
||||
CLI_SCRIPT="$VSCODE_PATH/out/vs/server/cli.js"
|
||||
node "$CLI_SCRIPT" "$PROD_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "--openExternal" "$@"
|
||||
43
resources/server/bin-dev/server.bat
Normal file
43
resources/server/bin-dev/server.bat
Normal file
@@ -0,0 +1,43 @@
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
title VSCode Remote Agent
|
||||
|
||||
pushd %~dp0\..\..\..
|
||||
|
||||
:: Configuration
|
||||
set NODE_ENV=development
|
||||
set VSCODE_DEV=1
|
||||
|
||||
:: Sync built-in extensions
|
||||
call yarn download-builtin-extensions
|
||||
|
||||
FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
|
||||
|
||||
:: Download nodejs executable for remote
|
||||
IF NOT EXIST "%NODE%" (
|
||||
call yarn gulp node
|
||||
)
|
||||
|
||||
:: Launch Agent
|
||||
set _FIRST_ARG=%1
|
||||
if "%_FIRST_ARG:~0,9%"=="--inspect" (
|
||||
set INSPECT=%1
|
||||
shift
|
||||
) else (
|
||||
set INSPECT=
|
||||
)
|
||||
|
||||
:loop1
|
||||
if "%~1"=="" goto after_loop
|
||||
set RESTVAR=%RESTVAR% %1
|
||||
shift
|
||||
goto loop1
|
||||
|
||||
:after_loop
|
||||
|
||||
call "%NODE%" %INSPECT% "out\vs\server\main.js" %RESTVAR%
|
||||
|
||||
popd
|
||||
|
||||
endlocal
|
||||
28
resources/server/bin-dev/server.sh
Executable file
28
resources/server/bin-dev/server.sh
Executable file
@@ -0,0 +1,28 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
|
||||
ROOT=$(dirname $(dirname $(dirname $(dirname $(realpath "$0")))))
|
||||
else
|
||||
ROOT=$(dirname $(dirname $(dirname $(dirname $(readlink -f $0)))))
|
||||
fi
|
||||
|
||||
function code() {
|
||||
cd $ROOT
|
||||
|
||||
# Sync built-in extensions
|
||||
yarn download-builtin-extensions
|
||||
|
||||
NODE=$(node build/lib/node.js)
|
||||
|
||||
# Download nodejs
|
||||
if [ ! -f $NODE ]; then
|
||||
yarn gulp node
|
||||
fi
|
||||
|
||||
NODE_ENV=development \
|
||||
VSCODE_DEV=1 \
|
||||
$NODE "$ROOT/out/vs/server/main.js" "$@"
|
||||
}
|
||||
|
||||
code "$@"
|
||||
4
resources/server/bin/code.cmd
Normal file
4
resources/server/bin/code.cmd
Normal file
@@ -0,0 +1,4 @@
|
||||
@echo off
|
||||
setlocal
|
||||
call "%~dp0..\node" "%~dp0..\out\vs\server\cli.js" "@@APPNAME@@" "@@VERSION@@" "@@COMMIT@@" "@@APPNAME@@.cmd" %*
|
||||
endlocal
|
||||
12
resources/server/bin/code.sh
Normal file
12
resources/server/bin/code.sh
Normal file
@@ -0,0 +1,12 @@
|
||||
#!/usr/bin/env sh
|
||||
#
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
#
|
||||
ROOT=$(dirname "$(dirname "$0")")
|
||||
|
||||
APP_NAME="@@APPNAME@@"
|
||||
VERSION="@@VERSION@@"
|
||||
COMMIT="@@COMMIT@@"
|
||||
EXEC_NAME="@@APPNAME@@"
|
||||
CLI_SCRIPT="$ROOT/out/vs/server/cli.js"
|
||||
"$ROOT/node" "$CLI_SCRIPT" "$APP_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "$@"
|
||||
4
resources/server/bin/helpers/browser.cmd
Normal file
4
resources/server/bin/helpers/browser.cmd
Normal file
@@ -0,0 +1,4 @@
|
||||
@echo off
|
||||
setlocal
|
||||
call "%~dp0..\..\node" "%~dp0..\..\out\vs\server\cli.js" "@@APPNAME@@" "@@VERSION@@" "@@COMMIT@@" "@@APPNAME@@.cmd" "--openExternal" %*
|
||||
endlocal
|
||||
12
resources/server/bin/helpers/browser.sh
Normal file
12
resources/server/bin/helpers/browser.sh
Normal file
@@ -0,0 +1,12 @@
|
||||
#!/usr/bin/env sh
|
||||
#
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
#
|
||||
ROOT=$(dirname "$(dirname "$(dirname "$0")")")
|
||||
|
||||
APP_NAME="@@APPNAME@@"
|
||||
VERSION="@@VERSION@@"
|
||||
COMMIT="@@COMMIT@@"
|
||||
EXEC_NAME="@@APPNAME@@"
|
||||
CLI_SCRIPT="$ROOT/out/vs/server/cli.js"
|
||||
"$ROOT/node" "$CLI_SCRIPT" "$APP_NAME" "$VERSION" "$COMMIT" "$EXEC_NAME" "--openExternal" "$@"
|
||||
24
resources/server/bin/server.cmd
Normal file
24
resources/server/bin/server.cmd
Normal file
@@ -0,0 +1,24 @@
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
set ROOT_DIR=%~dp0
|
||||
|
||||
set _FIRST_ARG=%1
|
||||
if "%_FIRST_ARG:~0,9%"=="--inspect" (
|
||||
set INSPECT=%1
|
||||
shift
|
||||
) else (
|
||||
set INSPECT=
|
||||
)
|
||||
|
||||
:loop1
|
||||
if "%~1"=="" goto after_loop
|
||||
set RESTVAR=%RESTVAR% %1
|
||||
shift
|
||||
goto loop1
|
||||
|
||||
:after_loop
|
||||
|
||||
"%ROOT_DIR%node.exe" %INSPECT% "%ROOT_DIR%out\vs\server\main.js" %RESTVAR%
|
||||
|
||||
endlocal
|
||||
12
resources/server/bin/server.sh
Normal file
12
resources/server/bin/server.sh
Normal file
@@ -0,0 +1,12 @@
|
||||
#!/usr/bin/env sh
|
||||
#
|
||||
# Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
#
|
||||
|
||||
case "$1" in
|
||||
--inspect*) INSPECT="$1"; shift;;
|
||||
esac
|
||||
|
||||
ROOT="$(dirname "$0")"
|
||||
|
||||
"$ROOT/node" ${INSPECT:-} "$ROOT/out/vs/server/main.js" "$@"
|
||||
BIN
resources/server/code-192.png
Normal file
BIN
resources/server/code-192.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
resources/server/code-512.png
Normal file
BIN
resources/server/code-512.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
resources/server/favicon.ico
Normal file
BIN
resources/server/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
19
resources/server/manifest.json
Normal file
19
resources/server/manifest.json
Normal file
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"name": "Code - OSS",
|
||||
"short_name": "Code- OSS",
|
||||
"start_url": "/",
|
||||
"lang": "en-US",
|
||||
"display": "standalone",
|
||||
"icons": [
|
||||
{
|
||||
"src": "/code-192.png",
|
||||
"type": "image/png",
|
||||
"sizes": "192x192"
|
||||
},
|
||||
{
|
||||
"src": "/code-512.png",
|
||||
"type": "image/png",
|
||||
"sizes": "512x512"
|
||||
}
|
||||
]
|
||||
}
|
||||
79
resources/server/test/test-remote-integration.bat
Normal file
79
resources/server/test/test-remote-integration.bat
Normal file
@@ -0,0 +1,79 @@
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
pushd %~dp0\..\..\..
|
||||
|
||||
IF "%~1" == "" (
|
||||
set AUTHORITY=vscode-remote://test+test/
|
||||
:: backward to forward slashed
|
||||
set EXT_PATH=%CD:\=/%/extensions
|
||||
|
||||
:: Download nodejs executable for remote
|
||||
call yarn gulp node
|
||||
) else (
|
||||
set AUTHORITY=%1
|
||||
set EXT_PATH=%2
|
||||
set VSCODEUSERDATADIR=%3
|
||||
)
|
||||
IF "%VSCODEUSERDATADIR%" == "" (
|
||||
set VSCODEUSERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,5%
|
||||
)
|
||||
|
||||
set REMOTE_VSCODE=%AUTHORITY%%EXT_PATH%
|
||||
set VSCODECRASHDIR=%~dp0\..\..\..\.build\crashes
|
||||
set VSCODELOGSDIR=%~dp0\..\..\..\.build\logs\remote-integration-tests
|
||||
set TESTRESOLVER_DATA_FOLDER=%TMP%\testresolverdatafolder-%RANDOM%-%TIME:~6,5%
|
||||
|
||||
if "%VSCODE_REMOTE_SERVER_PATH%"=="" (
|
||||
echo "Using remote server out of sources for integration tests"
|
||||
) else (
|
||||
set TESTRESOLVER_INSTALL_BUILTIN_EXTENSION=ms-vscode.vscode-smoketest-check
|
||||
echo "Using %VSCODE_REMOTE_SERVER_PATH% as server path"
|
||||
)
|
||||
|
||||
set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --disable-keytar --disable-inspect --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
|
||||
|
||||
:: Figure out which Electron to use for running tests
|
||||
if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
|
||||
echo "Storing crash reports into '%VSCODECRASHDIR%'."
|
||||
echo "Storing log files into '%VSCODELOGSDIR%'."
|
||||
|
||||
:: Tests in the extension host running from sources
|
||||
call .\scripts\code.bat --folder-uri=%REMOTE_VSCODE%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS%
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call .\scripts\code.bat --file-uri=%REMOTE_VSCODE%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS%
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
) else (
|
||||
echo "Storing crash reports into '%VSCODECRASHDIR%'."
|
||||
echo "Storing log files into '%VSCODELOGSDIR%'."
|
||||
echo "Using %INTEGRATION_TEST_ELECTRON_PATH% as Electron path"
|
||||
|
||||
:: Run from a built: need to compile all test extensions
|
||||
:: because we run extension tests from their source folders
|
||||
:: and the build bundles extensions into .build webpacked
|
||||
call yarn gulp compile-extension:vscode-api-tests^
|
||||
compile-extension:vscode-test-resolver
|
||||
|
||||
:: Configuration for more verbose output
|
||||
set VSCODE_CLI=1
|
||||
set ELECTRON_ENABLE_LOGGING=1
|
||||
set ELECTRON_ENABLE_STACK_DUMPING=1
|
||||
|
||||
:: Tests in the extension host running from built version (both client and server)
|
||||
call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_VSCODE%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS% --extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests --enable-proposed-api=vscode.image-preview
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call "%INTEGRATION_TEST_ELECTRON_PATH%" --file-uri=%REMOTE_VSCODE%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS% --extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests --enable-proposed-api=vscode.image-preview
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
)
|
||||
|
||||
IF "%3" == "" (
|
||||
rmdir /s /q %VSCODEUSERDATADIR%
|
||||
)
|
||||
|
||||
rmdir /s /q %TESTRESOLVER_DATA_FOLDER%
|
||||
|
||||
popd
|
||||
|
||||
endlocal
|
||||
114
resources/server/test/test-remote-integration.sh
Executable file
114
resources/server/test/test-remote-integration.sh
Executable file
@@ -0,0 +1,114 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
|
||||
ROOT=$(dirname $(dirname $(dirname $(dirname $(realpath "$0")))))
|
||||
VSCODEUSERDATADIR=`mktemp -d -t 'myuserdatadir'`
|
||||
TESTRESOLVER_DATA_FOLDER=`mktemp -d -t 'testresolverdatafolder'`
|
||||
else
|
||||
ROOT=$(dirname $(dirname $(dirname $(dirname $(readlink -f $0)))))
|
||||
VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`
|
||||
TESTRESOLVER_DATA_FOLDER=`mktemp -d 2>/dev/null`
|
||||
# --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm
|
||||
# partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
|
||||
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader"
|
||||
fi
|
||||
|
||||
cd $ROOT
|
||||
if [[ "$1" == "" ]]; then
|
||||
AUTHORITY=vscode-remote://test+test
|
||||
EXT_PATH=$ROOT/extensions
|
||||
# Load remote node
|
||||
yarn gulp node
|
||||
else
|
||||
AUTHORITY=$1
|
||||
EXT_PATH=$2
|
||||
VSCODEUSERDATADIR=${3:-$VSCODEUSERDATADIR}
|
||||
fi
|
||||
|
||||
export REMOTE_VSCODE=$AUTHORITY$EXT_PATH
|
||||
VSCODECRASHDIR=$ROOT/.build/crashes
|
||||
VSCODELOGSDIR=$ROOT/.build/logs/remote-integration-tests
|
||||
|
||||
# Figure out which Electron to use for running tests
|
||||
if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ]
|
||||
then
|
||||
echo "Storing crash reports into '$VSCODECRASHDIR'."
|
||||
echo "Storing log files into '$VSCODELOGSDIR'."
|
||||
|
||||
# code.sh makes sure Test Extensions are compiled
|
||||
INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh"
|
||||
|
||||
# No extra arguments when running out of sources
|
||||
EXTRA_INTEGRATION_TEST_ARGUMENTS=""
|
||||
else
|
||||
echo "Storing crash reports into '$VSCODECRASHDIR'."
|
||||
echo "Storing log files into '$VSCODELOGSDIR'."
|
||||
echo "Using $INTEGRATION_TEST_ELECTRON_PATH as Electron path for integration tests"
|
||||
|
||||
# Run from a built: need to compile all test extensions
|
||||
# because we run extension tests from their source folders
|
||||
# and the build bundles extensions into .build webpacked
|
||||
yarn gulp compile-extension:vscode-api-tests \
|
||||
compile-extension:vscode-test-resolver \
|
||||
compile-extension:markdown-language-features \
|
||||
compile-extension:typescript-language-features \
|
||||
compile-extension:emmet \
|
||||
compile-extension:git \
|
||||
compile-extension-media
|
||||
|
||||
# Configuration for more verbose output
|
||||
export VSCODE_CLI=1
|
||||
export ELECTRON_ENABLE_STACK_DUMPING=1
|
||||
export ELECTRON_ENABLE_LOGGING=1
|
||||
|
||||
# Running from a build, we need to enable the vscode-test-resolver extension
|
||||
EXTRA_INTEGRATION_TEST_ARGUMENTS="--extensions-dir=$EXT_PATH --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests --enable-proposed-api=vscode.image-preview --enable-proposed-api=vscode.git"
|
||||
fi
|
||||
|
||||
if [ -z "$INTEGRATION_TEST_APP_NAME" ]; then
|
||||
after_suite() { true; }
|
||||
else
|
||||
after_suite() { killall $INTEGRATION_TEST_APP_NAME || true; }
|
||||
fi
|
||||
|
||||
export TESTRESOLVER_DATA_FOLDER=$TESTRESOLVER_DATA_FOLDER
|
||||
|
||||
# Figure out which remote server to use for running tests
|
||||
if [ -z "$VSCODE_REMOTE_SERVER_PATH" ]
|
||||
then
|
||||
echo "Using remote server out of sources for integration tests"
|
||||
else
|
||||
echo "Using $VSCODE_REMOTE_SERVER_PATH as server path for integration tests"
|
||||
export TESTRESOLVER_INSTALL_BUILTIN_EXTENSION='ms-vscode.vscode-smoketest-check'
|
||||
fi
|
||||
|
||||
# Tests in the extension host
|
||||
|
||||
API_TESTS_DEFAULT_EXTRA_ARGS="--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=$VSCODECRASHDIR --logsPath=$VSCODELOGSDIR --no-cached-data --disable-updates --disable-keytar --disable-inspect --disable-workspace-trust --user-data-dir=$VSCODEUSERDATADIR"
|
||||
|
||||
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --folder-uri=$REMOTE_VSCODE/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$REMOTE_VSCODE/vscode-api-tests --extensionTestsPath=$REMOTE_VSCODE/vscode-api-tests/out/singlefolder-tests $API_TESTS_DEFAULT_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS
|
||||
after_suite
|
||||
|
||||
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --file-uri=$REMOTE_VSCODE/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=$REMOTE_VSCODE/vscode-api-tests --extensionTestsPath=$REMOTE_VSCODE/vscode-api-tests/out/workspace-tests $API_TESTS_DEFAULT_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS
|
||||
after_suite
|
||||
|
||||
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --folder-uri=$REMOTE_VSCODE/typescript-language-features/test-workspace --enable-proposed-api=vscode.typescript-language-features --extensionDevelopmentPath=$REMOTE_VSCODE/typescript-language-features --extensionTestsPath=$REMOTE_VSCODE/typescript-language-features/out/test/unit $API_TESTS_DEFAULT_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS
|
||||
after_suite
|
||||
|
||||
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --folder-uri=$REMOTE_VSCODE/markdown-language-features/test-workspace --extensionDevelopmentPath=$REMOTE_VSCODE/markdown-language-features --extensionTestsPath=$REMOTE_VSCODE/markdown-language-features/out/test $API_TESTS_DEFAULT_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS
|
||||
after_suite
|
||||
|
||||
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --folder-uri=$REMOTE_VSCODE/emmet/test-workspace --extensionDevelopmentPath=$REMOTE_VSCODE/emmet --extensionTestsPath=$REMOTE_VSCODE/emmet/out/test $API_TESTS_DEFAULT_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS
|
||||
after_suite
|
||||
|
||||
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --folder-uri=$AUTHORITY$(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$REMOTE_VSCODE/git --extensionTestsPath=$REMOTE_VSCODE/git/out/test $API_TESTS_DEFAULT_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS
|
||||
after_suite
|
||||
|
||||
# Clean up
|
||||
if [[ "$3" == "" ]]; then
|
||||
rm -rf $VSCODEUSERDATADIR
|
||||
fi
|
||||
|
||||
rm -rf $TESTRESOLVER_DATA_FOLDER
|
||||
55
resources/server/test/test-web-integration.bat
Normal file
55
resources/server/test/test-web-integration.bat
Normal file
@@ -0,0 +1,55 @@
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
pushd %~dp0\..\..\..
|
||||
|
||||
IF "%~1" == "" (
|
||||
set AUTHORITY=vscode-remote://test+test/
|
||||
:: backward to forward slashed
|
||||
set EXT_PATH=%CD:\=/%/extensions
|
||||
|
||||
:: Download nodejs executable for remote
|
||||
call yarn gulp node
|
||||
) else (
|
||||
set AUTHORITY=%1
|
||||
set EXT_PATH=%2
|
||||
)
|
||||
|
||||
set REMOTE_VSCODE=%AUTHORITY%%EXT_PATH%
|
||||
|
||||
if "%VSCODE_REMOTE_SERVER_PATH%"=="" (
|
||||
echo "Using remote server out of sources for integration web tests"
|
||||
) else (
|
||||
echo "Using %VSCODE_REMOTE_SERVER_PATH% as server path for web integration tests"
|
||||
|
||||
:: Run from a built: need to compile all test extensions
|
||||
:: because we run extension tests from their source folders
|
||||
:: and the build bundles extensions into .build webpacked
|
||||
call yarn gulp compile-extension:vscode-api-tests^
|
||||
compile-extension:markdown-language-features^
|
||||
compile-extension:typescript-language-features^
|
||||
compile-extension:emmet^
|
||||
compile-extension:git^
|
||||
compile-extension-media
|
||||
)
|
||||
|
||||
call node .\test\integration\browser\out\index.js --workspacePath=.\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=.\extensions\vscode-api-tests --extensionTestsPath=.\extensions\vscode-api-tests\out\singlefolder-tests %*
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call node .\test\integration\browser\out\index.js --workspacePath=.\extensions\vscode-api-tests\testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=.\extensions\vscode-api-tests --extensionTestsPath=.\extensions\vscode-api-tests\out\workspace-tests %*
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call node .\test\integration\browser\out\index.js --workspacePath=.\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=.\extensions\typescript-language-features --extensionTestsPath=.\extensions\typescript-language-features\out\test\unit %*
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call node .\test\integration\browser\out\index.js --workspacePath=.\extensions\markdown-language-features\test-workspace --extensionDevelopmentPath=.\extensions\markdown-language-features --extensionTestsPath=.\extensions\markdown-language-features\out\test %*
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call node .\test\integration\browser\out\index.js --workspacePath=.\extensions\emmet\test-workspace --extensionDevelopmentPath=.\extensions\emmet --extensionTestsPath=.\extensions\emmet\out\test %*
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
|
||||
set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
|
||||
mkdir %GITWORKSPACE%
|
||||
call node .\test\integration\browser\out\index.js --workspacePath=%GITWORKSPACE% --extensionDevelopmentPath=.\extensions\git --extensionTestsPath=.\extensions\git\out\test --enable-proposed-api=vscode.git %*
|
||||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
36
resources/server/test/test-web-integration.sh
Executable file
36
resources/server/test/test-web-integration.sh
Executable file
@@ -0,0 +1,36 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
|
||||
ROOT=$(dirname $(dirname $(dirname $(dirname $(realpath "$0")))))
|
||||
else
|
||||
ROOT=$(dirname $(dirname $(dirname $(dirname $(readlink -f $0)))))
|
||||
fi
|
||||
|
||||
cd $ROOT
|
||||
|
||||
if [ -z "$VSCODE_REMOTE_SERVER_PATH" ]
|
||||
then
|
||||
echo "Using remote server out of sources for integration web tests"
|
||||
else
|
||||
echo "Using $VSCODE_REMOTE_SERVER_PATH as server path for web integration tests"
|
||||
|
||||
# Run from a built: need to compile all test extensions
|
||||
# because we run extension tests from their source folders
|
||||
# and the build bundles extensions into .build webpacked
|
||||
yarn gulp compile-extension:vscode-api-tests \
|
||||
compile-extension:markdown-language-features \
|
||||
compile-extension:typescript-language-features \
|
||||
compile-extension:emmet \
|
||||
compile-extension:git \
|
||||
compile-extension-media
|
||||
fi
|
||||
|
||||
# Tests in the extension host
|
||||
node test/integration/browser/out/index.js --workspacePath $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests "$@"
|
||||
node test/integration/browser/out/index.js --workspacePath $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests "$@"
|
||||
node test/integration/browser/out/index.js --workspacePath $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test/unit "$@"
|
||||
node test/integration/browser/out/index.js --workspacePath $ROOT/extensions/markdown-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test "$@"
|
||||
node test/integration/browser/out/index.js --workspacePath $ROOT/extensions/emmet/test-workspace --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test "$@"
|
||||
node test/integration/browser/out/index.js --workspacePath $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test "$@"
|
||||
24
resources/server/web.bat
Normal file
24
resources/server/web.bat
Normal file
@@ -0,0 +1,24 @@
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
title VSCode Web Server
|
||||
|
||||
pushd %~dp0\..\..
|
||||
|
||||
:: Configuration
|
||||
set NODE_ENV=development
|
||||
set VSCODE_DEV=1
|
||||
|
||||
:: Sync built-in extensions
|
||||
call yarn download-builtin-extensions
|
||||
|
||||
:: Download nodejs executable for remote
|
||||
call yarn gulp node
|
||||
|
||||
:: Launch Server
|
||||
FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
|
||||
call "%NODE%" resources\server\bin-dev\code-web.js %*
|
||||
|
||||
popd
|
||||
|
||||
endlocal
|
||||
26
resources/server/web.sh
Executable file
26
resources/server/web.sh
Executable file
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
|
||||
ROOT=$(dirname $(dirname $(dirname $(realpath "$0"))))
|
||||
else
|
||||
ROOT=$(dirname $(dirname $(dirname $(readlink -f $0))))
|
||||
fi
|
||||
|
||||
function code() {
|
||||
cd $ROOT
|
||||
|
||||
# Sync built-in extensions
|
||||
yarn download-builtin-extensions
|
||||
|
||||
# Load remote node
|
||||
yarn gulp node
|
||||
|
||||
NODE=$(node build/lib/node.js)
|
||||
|
||||
NODE_ENV=development \
|
||||
VSCODE_DEV=1 \
|
||||
$NODE $(dirname "$0")/bin-dev/code-web.js "$@"
|
||||
}
|
||||
|
||||
code "$@"
|
||||
Reference in New Issue
Block a user