From ccc95917cdee1f7a20c5a7905b8570b1ef8fe4bb Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Wed, 6 Feb 2019 10:39:26 -0500 Subject: [PATCH] Use Common.TestResultsDirectory for test results --- script/vsts/platforms/linux.yml | 6 +++--- script/vsts/platforms/macos.yml | 6 +++--- script/vsts/platforms/windows.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 2d339ff6c..400fb75cf 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -25,20 +25,20 @@ jobs: CI: true CI_PROVIDER: VSTS ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results + TEST_JUNIT_XML_PATH: $(Common.TestResultsDirectory) displayName: Run tests condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - script: find "${TEST_JUNIT_XML_PATH}" || true env: - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results + TEST_JUNIT_XML_PATH: $(Common.TestResultsDirectory) displayName: Dump test results condition: succeededOrFailed() - task: PublishTestResults@2 inputs: testResultsFormat: JUnit - searchFolder: $(Agent.HomeDirectory)/test-results + searchFolder: $(Common.TestResultsDirectory) mergeTestResults: true testRunTitle: Linux condition: succeededOrFailed() diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index f6021c77a..3d4041fc8 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -45,20 +45,20 @@ jobs: CI: true CI_PROVIDER: VSTS ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results + TEST_JUNIT_XML_PATH: $(Common.TestResultsDirectory) displayName: Run tests condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - script: find "${TEST_JUNIT_XML_PATH}" env: - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results + TEST_JUNIT_XML_PATH: $(Common.TestResultsDirectory) displayName: Dump test results condition: succeededOrFailed() - task: PublishTestResults@2 inputs: testResultsFormat: JUnit - searchFolder: $(Agent.HomeDirectory)/test-results + searchFolder: $(Common.TestResultsDirectory) mergeTestResults: true testRunTitle: MacOS condition: succeededOrFailed() diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index a555b90e2..7dfa4143a 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -70,14 +70,14 @@ jobs: CI: true CI_PROVIDER: VSTS ATOM_JASMINE_REPORTER: list - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)\test-results + TEST_JUNIT_XML_PATH: $(Common.TestResultsDirectory) BUILD_ARCH: $(buildArch) displayName: Run tests condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) - powershell: Get-ChildItem -Recurse %TEST_JUNIT_XML_PATH% env: - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)\test-results + TEST_JUNIT_XML_PATH: $(Common.TestResultsDirectory) displayName: Dump test results - task: PublishTestResults@2