From bb508d8eb102ddcdb56ed9b94330aefd36339aa3 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 17 Mar 2017 18:19:31 +0100 Subject: [PATCH] USERDATADIR => VSCODEUSERDATADIR --- scripts/test-integration.bat | 8 ++++---- scripts/test-integration.sh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index 88373fba898..9d43cf756cd 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -4,13 +4,13 @@ setlocal if not "%APPVEYOR%" == "" ( set ELECTRON_RUN_AS_NODE= ) -set USERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,5% +set VSCODEUSERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,5% :: Integration Tests -.\scripts\code.bat %~dp0\..\extensions\vscode-api-tests\testWorkspace --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out --disableExtensions --user-data-dir=%USERDATADIR% -.\scripts\code.bat %~dp0\..\extensions\vscode-colorize-tests\test --extensionDevelopmentPath=%~dp0\..\extensions\vscode-colorize-tests --extensionTestsPath=%~dp0\..\extensions\vscode-colorize-tests\out --user-data-dir=%USERDATADIR% +.\scripts\code.bat %~dp0\..\extensions\vscode-api-tests\testWorkspace --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out --disableExtensions --user-data-dir=%VSCODEUSERDATADIR% +.\scripts\code.bat %~dp0\..\extensions\vscode-colorize-tests\test --extensionDevelopmentPath=%~dp0\..\extensions\vscode-colorize-tests --extensionTestsPath=%~dp0\..\extensions\vscode-colorize-tests\out --user-data-dir=%VSCODEUSERDATADIR% .\scripts\test.sh --run %~dp0..\out\vs\workbench\services\search\test\node\textSearch.integrationTest.js -g integration -rmdir /s /q %USERDATADIR% +rmdir /s /q %VSCODEUSERDATADIR% endlocal diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index fa4dc02bc36..e2d18fa353c 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -4,15 +4,15 @@ set -e if [[ "$OSTYPE" == "darwin"* ]]; then realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; } ROOT=$(dirname $(dirname $(realpath "$0"))) - USERDATADIR=`mktemp -d -t 'myuserdatadir'` + VSCODEUSERDATADIR=`mktemp -d -t 'myuserdatadir'` else ROOT=$(dirname $(dirname $(readlink -f $0))) - USERDATADIR=`mktemp -d 2>/dev/null` + VSCODEUSERDATADIR=`mktemp -d 2>/dev/null` fi # Integration Tests -./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out --disableExtensions --user-data-dir=$USERDATADIR -./scripts/code.sh $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --user-data-dir=$USERDATADIR +./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out --disableExtensions --user-data-dir=$VSCODEUSERDATADIR +./scripts/code.sh $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --user-data-dir=$VSCODEUSERDATADIR ./scripts/test.sh --run $ROOT/out/vs/workbench/services/search/test/node/textSearch.integrationTest.js -g integration -rm -r $USERDATADIR \ No newline at end of file +rm -r $VSCODEUSERDATADIR \ No newline at end of file