Compile extensions for integration tests once

microsoft · May 17, 2022 · 0d33e60 · 0d33e60
1 parent 1db4912
commit 0d33e60
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 23 deletions.
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
@@ -221,6 +221,28 @@ steps:
       timeoutInMinutes: 20
       condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
 
+  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
+    - powershell: |
+        . build/azure-pipelines/win32/exec.ps1
+        $ErrorActionPreference = "Stop"
+        exec { yarn gulp compile-extension:vscode-api-tests }
+        exec { yarn gulp compile-extension:vscode-colorize-tests }
+        exec { yarn gulp compile-extension:markdown-language-features }
+        exec { yarn gulp compile-extension:typescript-language-features }
+        exec { yarn gulp compile-extension:vscode-custom-editor-tests }
+        exec { yarn gulp compile-extension:vscode-notebook-tests }
+        exec { yarn gulp compile-extension:emmet }
+        exec { yarn gulp compile-extension:css-language-features-server }
+        exec { yarn gulp compile-extension:html-language-features-server }
+        exec { yarn gulp compile-extension:json-language-features-server }
+        exec { yarn gulp compile-extension:git }
+        exec { yarn gulp compile-extension:ipynb }
+        exec { yarn gulp compile-extension-media }
+        exec { yarn gulp compile-extension:microsoft-authentication }
+        exec { yarn gulp compile-extension:github-authentication }
+        exec { yarn gulp compile-extension:vscode-test-resolver }
+      displayName: Build built-in extensions
+
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - powershell: |
         # Figure out the full absolute path of the product we just built

diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
@@ -21,19 +21,19 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
 	:: Run from a built: need to compile all test extensions
 	:: because we run extension tests from their source folders
 	:: and the build bundles extensions into .build webpacked
-	call yarn gulp 	compile-extension:vscode-api-tests^
-					compile-extension:vscode-colorize-tests^
-					compile-extension:markdown-language-features^
-					compile-extension:typescript-language-features^
-					compile-extension:vscode-custom-editor-tests^
-					compile-extension:vscode-notebook-tests^
-					compile-extension:emmet^
-					compile-extension:css-language-features-server^
-					compile-extension:html-language-features-server^
-					compile-extension:json-language-features-server^
-					compile-extension:git^
-					compile-extension:ipynb^
-					compile-extension-media
+	:: call yarn gulp 	compile-extension:vscode-api-tests^
+	:: 				compile-extension:vscode-colorize-tests^
+	:: 				compile-extension:markdown-language-features^
+	:: 				compile-extension:typescript-language-features^
+	:: 				compile-extension:vscode-custom-editor-tests^
+	:: 				compile-extension:vscode-notebook-tests^
+	:: 				compile-extension:emmet^
+	:: 				compile-extension:css-language-features-server^
+	:: 				compile-extension:html-language-features-server^
+	:: 				compile-extension:json-language-features-server^
+	:: 				compile-extension:git^
+	:: 				compile-extension:ipynb^
+	:: 				compile-extension-media
 
 	:: Configuration for more verbose output
 	set VSCODE_CLI=1

diff --git a/scripts/test-remote-integration.bat b/scripts/test-remote-integration.bat
@@ -53,10 +53,10 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
 	:: Run from a built: need to compile all test extensions
 	:: because we run extension tests from their source folders
 	:: and the build bundles extensions into .build webpacked
-	call yarn gulp 	compile-extension:vscode-api-tests^
-					compile-extension:microsoft-authentication^
-					compile-extension:github-authentication^
-					compile-extension:vscode-test-resolver
+	:: call yarn gulp 	compile-extension:vscode-api-tests^
+	:: 				compile-extension:microsoft-authentication^
+	:: 				compile-extension:github-authentication^
+	:: 				compile-extension:vscode-test-resolver
 
 	:: Configuration for more verbose output
 	set VSCODE_CLI=1

diff --git a/scripts/test-web-integration.bat b/scripts/test-web-integration.bat
@@ -25,12 +25,12 @@ if "%VSCODE_REMOTE_SERVER_PATH%"=="" (
 	:: Run from a built: need to compile all test extensions
 	:: because we run extension tests from their source folders
 	:: and the build bundles extensions into .build webpacked
-	call yarn gulp	compile-extension:vscode-api-tests^
-					compile-extension:markdown-language-features^
-					compile-extension:typescript-language-features^
-					compile-extension:emmet^
-					compile-extension:git^
-					compile-extension-media
+	:: call yarn gulp	compile-extension:vscode-api-tests^
+	:: 				compile-extension:markdown-language-features^
+	:: 				compile-extension:typescript-language-features^
+	:: 				compile-extension:emmet^
+	:: 				compile-extension:git^
+	:: 				compile-extension-media
 )
 
 if not exist ".\test\integration\browser\out\index.js" (