Add non-O# test leg

azure-pipelines.yml

@@ -39,8 +39,25 @@ stages:
       matrix:
         linux:
           demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+        windows:
+          demandsName: ImageOverride -equals 1es-windows-2022-open
     pool:
       name: NetCore-Public
       demands: $(demandsName)
     steps:
     - template: azure-pipelines/test.yml
+
+- stage: Test_Omnisharp
+  displayName: Test Omnisharp
+  dependsOn: []
+  jobs:
+  - job: Test
+    strategy:
+      matrix:
+        linux:
+          demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+    pool:
+      name: NetCore-Public
+      demands: $(demandsName)
+    steps:
+    - template: azure-pipelines/test-omnisharp.yml

azure-pipelines/test-omnisharp.yml

@@ -0,0 +1,26 @@
+steps:
+- checkout: self
+  clean: true
+  submodules: true
+  fetchTags: false
+  fetchDepth: 1
+
+- template: prereqs.yml
+
+- pwsh: |
+    if ($IsLinux) {
+      Write-Host "Activating screen emulation"
+      /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+      $env:DISPLAY=':99.0'
+      Write-Host "Now running tests"
+    }
+
+    npm run omnisharptest
+  displayName: 🧪 Run unit and integration tests
+
+- task: PublishPipelineArtifact@1
+  condition: failed()
+  displayName: 'Upload integration test logs'
+  inputs:
+    targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
+    artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'

azure-pipelines/test.yml

@@ -15,7 +15,7 @@ steps:
       Write-Host "Now running tests"
     }
 
-    npm run omnisharptest
+    npm run test
   displayName: 🧪 Run unit and integration tests
 
 - task: PublishPipelineArtifact@1

package.json

@@ -59,6 +59,7 @@
     "compileDev": "tsc -p ./ && npx eslint ./ && webpack --mode development && npm run l10nDevGenerateLocalizationBundle",
     "watch": "tsc -watch -p ./",
     "tdd": "mocha --config ./.mocharc.jsonc --watch --watch-extensions ts omnisharptest/omnisharpUnitTests/**/*.test.ts*",
+    "test": "tsc -p ./ && gulp test",
     "omnisharptest": "tsc -p ./ && gulp omnisharptest",
     "omnisharptest:unit": "tsc -p ./ && gulp omnisharptest:unit",
     "omnisharptest:feature": "tsc -p ./ && gulp omnisharptest:feature",

tasks/testTasks.ts

@@ -53,15 +53,8 @@ gulp.task('omnisharptest:unit', async () => {
     return result;
 });
 
-gulp.task('jest:test', async () => {
-    const result = await spawnNode([jestPath]);
-
-    if (result.code === null || result.code > 0) {
-        // Ensure that gulp fails when tests fail
-        throw new Error(`Exit code: ${result.code}  Signal: ${result.signal}`);
-    }
-
-    return result;
+gulp.task('omnisharp:jest:test', async () => {
+    runJestTest(/.*omnisharpJestTests.*/);
 });
 
 const projectNames = ['singleCsproj', 'slnWithCsproj', 'slnFilterWithCsproj', 'BasicRazorApp2_1'];
@@ -90,9 +83,15 @@ gulp.task(
 // TODO: Enable lsp integration tests once tests for unimplemented features are disabled.
 gulp.task(
     'omnisharptest',
-    gulp.series('jest:test', 'omnisharptest:feature', 'omnisharptest:unit', 'omnisharptest:integration:stdio')
+    gulp.series('omnisharp:jest:test', 'omnisharptest:feature', 'omnisharptest:unit', 'omnisharptest:integration:stdio')
 );
 
+gulp.task('test:unit', async () => {
+    runJestTest(/unitTests.*\.ts/);
+});
+
+gulp.task('test', gulp.series('test:unit'));
+
 async function runIntegrationTest(testAssetName: string, engine: 'stdio' | 'lsp') {
     const env = {
         OSVC_SUITE: testAssetName,
@@ -114,3 +113,14 @@ async function runIntegrationTest(testAssetName: string, engine: 'stdio' | 'lsp'
 
     return result;
 }
+
+async function runJestTest(testFilterRegex: RegExp) {
+    const result = await spawnNode([jestPath, testFilterRegex.source]);
+
+    if (result.code === null || result.code > 0) {
+        // Ensure that gulp fails when tests fail
+        throw new Error(`Exit code: ${result.code}  Signal: ${result.signal}`);
+    }
+
+    return result;
+}