diff options
| author | Benjamin Pasero <benjpas@microsoft.com> | 2021-11-10 10:13:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 10:13:56 +0300 |
| commit | bef4dba21f68bbdb8d9f08fe04b2e1858597722b (patch) | |
| tree | 256e6a8d127d6d7bc77c4e2623690940cc6b276c /resources | |
| parent | 42f10bb643c63c91421a62e6fa8d08d5297dd09f (diff) | |
Parcel update and CI improvements (#136830)
* :up: product
* :up: parcel/watcher
* :up: parcel/watcher
* tests - separate remote logs from others
* store server logs too
* more tweaks
* fix name
* error when 10s passed
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/server/test/test-remote-integration.bat | 3 | ||||
| -rwxr-xr-x | resources/server/test/test-remote-integration.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/resources/server/test/test-remote-integration.bat b/resources/server/test/test-remote-integration.bat index 47ee286f120..c31dff424d2 100644 --- a/resources/server/test/test-remote-integration.bat +++ b/resources/server/test/test-remote-integration.bat @@ -21,8 +21,9 @@ IF "%VSCODEUSERDATADIR%" == "" ( set REMOTE_VSCODE=%AUTHORITY%%EXT_PATH% set VSCODECRASHDIR=%~dp0\..\..\..\.build\crashes -set VSCODELOGSDIR=%~dp0\..\..\..\.build\logs\remote-integration-tests +set VSCODELOGSDIR=%~dp0\..\..\..\.build\logs\integration-tests-remote set TESTRESOLVER_DATA_FOLDER=%TMP%\testresolverdatafolder-%RANDOM%-%TIME:~6,5% +set TESTRESOLVER_LOGS_FOLDER=%VSCODELOGSDIR%\server if "%VSCODE_REMOTE_SERVER_PATH%"=="" ( echo "Using remote server out of sources for integration tests" diff --git a/resources/server/test/test-remote-integration.sh b/resources/server/test/test-remote-integration.sh index 09d14d50c95..71fee7327b4 100755 --- a/resources/server/test/test-remote-integration.sh +++ b/resources/server/test/test-remote-integration.sh @@ -29,7 +29,7 @@ fi export REMOTE_VSCODE=$AUTHORITY$EXT_PATH VSCODECRASHDIR=$ROOT/.build/crashes -VSCODELOGSDIR=$ROOT/.build/logs/remote-integration-tests +VSCODELOGSDIR=$ROOT/.build/logs/integration-tests-remote # Figure out which Electron to use for running tests if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ] @@ -74,6 +74,7 @@ else fi export TESTRESOLVER_DATA_FOLDER=$TESTRESOLVER_DATA_FOLDER +export TESTRESOLVER_LOGS_FOLDER=$VSCODELOGSDIR/server # Figure out which remote server to use for running tests if [ -z "$VSCODE_REMOTE_SERVER_PATH" ] |