From c95ea16a447777a541a1c522351c0e7edb22eda1 Mon Sep 17 00:00:00 2001 From: Amir Omidi Date: Fri, 4 Oct 2019 02:16:07 -0700 Subject: [PATCH] Amir/tests after build (#7507) * test * remove disable extensions * fix the file... --- scripts/sql-test-integration.sh | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/scripts/sql-test-integration.sh b/scripts/sql-test-integration.sh index d8e49e3c45..7083033359 100755 --- a/scripts/sql-test-integration.sh +++ b/scripts/sql-test-integration.sh @@ -18,6 +18,19 @@ if [[ "$ADS_TEST_GREP" == "" ]]; then export ADS_TEST_INVERT_GREP=1 fi +# Figure out which Electron to use for running tests +if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ] +then + # Run out of sources: no need to compile as code.sh takes care of it + INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh" + + echo "Running integration tests out of sources." +else + # Run from a built: need to compile all test extensions + + echo "Running integration tests with '$INTEGRATION_TEST_ELECTRON_PATH' as build." +fi + cd $ROOT echo VSCODEUSERDATADIR=$VSCODEUSERDATADIR echo VSCODEEXTDIR=$VSCODEEXTDIR @@ -27,10 +40,26 @@ if [[ "$SKIP_PYTHON_INSTALL_TEST" == "1" ]]; then 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 + $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 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 +$INTEGRATION_TEST_ELECTRON_PATH --extensionDevelopmentPath=$ROOT/extensions/admin-pack \ +--extensionDevelopmentPath=$ROOT/extensions/admin-tool-ext-win \ +--extensionDevelopmentPath=$ROOT/extensions/agent \ +--extensionDevelopmentPath=$ROOT/extensions/azurecore \ +--extensionDevelopmentPath=$ROOT/extensions/big-data-cluster \ +--extensionDevelopmentPath=$ROOT/extensions/cms \ +--extensionDevelopmentPath=$ROOT/extensions/dacpac \ +--extensionDevelopmentPath=$ROOT/extensions/import \ +--extensionDevelopmentPath=$ROOT/extensions/integration-tests \ +--extensionDevelopmentPath=$ROOT/extensions/mssql \ +--extensionDevelopmentPath=$ROOT/extensions/notebook \ +--extensionDevelopmentPath=$ROOT/extensions/profiler \ +--extensionDevelopmentPath=$ROOT/extensions/resource-deployment \ +--extensionDevelopmentPath=$ROOT/extensions/schema-compare \ +--extensionTestsPath=$ROOT/extensions/integration-tests/out \ +--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