diff --git a/scripts/sql-test-integration.bat b/scripts/sql-test-integration.bat index 37ba373294..202fcb6f50 100644 --- a/scripts/sql-test-integration.bat +++ b/scripts/sql-test-integration.bat @@ -4,14 +4,18 @@ pushd %~dp0\.. set VSCODEUSERDATADIR=%TMP%\adsuser-%RANDOM%-%TIME:~6,5% set VSCODEEXTENSIONSDIR=%TMP%\adsext-%RANDOM%-%TIME:~6,5% -set PYTHON_TEST_PATH=%VSCODEUSERDATADIR%\TestPythonInstallation echo %VSCODEUSERDATADIR% echo %VSCODEEXTENSIONSDIR% -echo %PYTHON_TEST_PATH% @echo OFF -:: This first notebook test will do the python install that the later tests depend on -call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\notebook --extensionTestsPath=%~dp0\..\extensions\notebook\out\integrationTest --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222 +if "%SKIP_PYTHON_INSTALL_TEST%" == "1" ( + echo Skipping Python installation tests. +) else ( + set PYTHON_TEST_PATH=%VSCODEUSERDATADIR%\TestPythonInstallation + echo %PYTHON_TEST_PATH% + call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\notebook --extensionTestsPath=%~dp0\..\extensions\notebook\out\integrationTest --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222 +) + call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\integration-tests --extensionTestsPath=%~dp0\..\extensions\integration-tests\out --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222 if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/scripts/sql-test-integration.sh b/scripts/sql-test-integration.sh index 69b14c9dfa..e37f782b8f 100755 --- a/scripts/sql-test-integration.sh +++ b/scripts/sql-test-integration.sh @@ -12,14 +12,18 @@ else VSCODEEXTDIR=`mktemp -d 2>/dev/null` fi -export PYTHON_TEST_PATH=$VSCODEUSERDATADIR/TestPythonInstallation - cd $ROOT echo $VSCODEUSERDATADIR echo $VSCODEEXTDIR -echo $PYTHON_TEST_PATH -./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/notebook --extensionTestsPath=$ROOT/extensions/notebook/out/integrationTest --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222 +if [[ "$SKIP_PYTHON_INSTALL_TEST" == "1" ]]; then + echo Skipping Python installation tests. +else + export PYTHON_TEST_PATH=$VSCODEUSERDATADIR/TestPythonInstallation + echo $PYTHON_TEST_PATH + ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/notebook --extensionTestsPath=$ROOT/extensions/notebook/out/integrationTest --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222 +fi + ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/integration-tests --extensionTestsPath=$ROOT/extensions/integration-tests/out --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222 rm -r -f $VSCODEUSERDATADIR