From 0788796f1a9bb54ca6cbdb7bb2e972e7c50de08e Mon Sep 17 00:00:00 2001 From: Amir Omidi Date: Tue, 8 Oct 2019 17:43:57 -0700 Subject: [PATCH] add --nogpu to our integration tests (#7495) --- scripts/sql-test-integration.bat | 4 ++-- scripts/sql-test-integration.sh | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/sql-test-integration.bat b/scripts/sql-test-integration.bat index fae85b298c..f41fe13d41 100644 --- a/scripts/sql-test-integration.bat +++ b/scripts/sql-test-integration.bat @@ -21,10 +21,10 @@ if "%SKIP_PYTHON_INSTALL_TEST%" == "1" ( ) 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 --nogpu --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 +call .\scripts\code.bat -nogpu --extensionDevelopmentPath=%~dp0\..\extensions\integration-tests --extensionTestsPath=%~dp0\..\extensions\integration-tests\out --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222 rmdir /s /q %VSCODEUSERDATADIR% rmdir /s /q %VSCODEEXTENSIONSDIR% diff --git a/scripts/sql-test-integration.sh b/scripts/sql-test-integration.sh index f72e8ac935..ca20654608 100755 --- a/scripts/sql-test-integration.sh +++ b/scripts/sql-test-integration.sh @@ -41,10 +41,11 @@ if [[ "$SKIP_PYTHON_INSTALL_TEST" == "1" ]]; then else export PYTHON_TEST_PATH=$VSCODEUSERDATADIR/TestPythonInstallation echo $PYTHON_TEST_PATH - $INTEGRATION_TEST_ELECTRON_PATH --extensionDevelopmentPath=$ROOT/extensions/notebook --extensionTestsPath=$ROOT/extensions/notebook/out/integrationTest --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222 --disable-telemetry --disable-crash-reporter --disable-updates --skip-getting-started --disable-inspect + + $INTEGRATION_TEST_ELECTRON_PATH --nogpu --extensionDevelopmentPath=$ROOT/extensions/notebook --extensionTestsPath=$ROOT/extensions/notebook/out/integrationTest --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222 --disable-telemetry --disable-crash-reporter --disable-updates --skip-getting-started --disable-inspect fi -$INTEGRATION_TEST_ELECTRON_PATH --extensionDevelopmentPath=$ROOT/extensions/admin-pack \ +$INTEGRATION_TEST_ELECTRON_PATH --nogpu --extensionDevelopmentPath=$ROOT/extensions/admin-pack \ --extensionDevelopmentPath=$ROOT/extensions/admin-tool-ext-win \ --extensionDevelopmentPath=$ROOT/extensions/agent \ --extensionDevelopmentPath=$ROOT/extensions/azurecore \ @@ -62,5 +63,6 @@ $INTEGRATION_TEST_ELECTRON_PATH --extensionDevelopmentPath=$ROOT/extensions/admi --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR \ --disable-telemetry --disable-crash-reporter --disable-updates --skip-getting-started --disable-inspect + rm -r -f $VSCODEUSERDATADIR rm -r $VSCODEEXTDIR