Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions script/test
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,21 @@ for (let testFile of testFiles) {
'--resource-path', resourcePath,
'--test', testFile
]
const cp = childProcess.spawn(executablePath, testArguments, {stdio: 'inherit', env: testEnv})
cp.on('error', error => { callback(error) })
cp.on('close', exitCode => { callback(null, {exitCode, step: `core-render-process for ${testFile}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`}) })
const cp = childProcess.spawn(executablePath, testArguments, { env: testEnv})
let stderrOutput = ''
cp.stderr.on('data', data => { stderrOutput += data })
cp.stdout.on('data', data => { stderrOutput += data })
cp.on('error', error => {
console.log(error, "error")
callback(error)
})
cp.on('close', exitCode => {
if (exitCode !== 0) {
console.log(`##[error] Renderer tests failed for ${testFile}:`.red)
console.log(stderrOutput)
}
callback(null, {exitCode, step: `core-render-process for ${testFile}.`, testCommand: `You can run the test again using: \n\t ${executablePath} ${testArguments.join(' ')}`})
})
})
}

Expand Down Expand Up @@ -269,7 +281,7 @@ function requestedTestSuites (platform) {
return suites
}

async.parallel(testSuitesToRun, function (err, results) {
async.series(testSuitesToRun, function (err, results) {
if (err) {
console.error(err)
process.exit(1)
Expand Down
2 changes: 1 addition & 1 deletion script/vsts/platforms/templates/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ steps:
GITHUB_TOKEN: $(GITHUB_TOKEN)
CI: true
CI_PROVIDER: VSTS
condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true'))
condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true'))
2 changes: 1 addition & 1 deletion script/vsts/platforms/templates/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ steps:

# Crash Reports
- pwsh: |
mkdir -f -p $env:ARTIFACT_STAGING_DIR/crash-reports
New-Item -Path $env:ARTIFACT_STAGING_DIR/crash-reports -Type Directory -Force
if (($env:AGENT_OS -eq "Windows_NT") -and (Test-Path "$env:TEMP/Atom Crashes")) {
cp "$env:TEMP/Atom Crashes/*.dmp" $env:ARTIFACT_STAGING_DIR/crash-reports
} else {
Expand Down
4 changes: 2 additions & 2 deletions script/vsts/platforms/windows.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
jobs:
- job: Windows_Build
- job: Windows
dependsOn: GetReleaseVersion
timeoutInMinutes: 180
strategy:
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))

- job: Windows_RendererTests
dependsOn: Windows_Build
dependsOn: Windows
timeoutInMinutes: 180
strategy:
maxParallel: 2
Expand Down