From 3b7ac36becdf5f8f86c19e61b37bcc078b970947 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 11 Feb 2019 13:31:53 -0500 Subject: [PATCH] Azure doesn't like trailing whitespace --- script/test | 3 ++- script/vsts/platforms/linux.yml | 2 +- script/vsts/platforms/macos.yml | 2 +- script/vsts/platforms/windows.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/script/test b/script/test index 760d4e55e..da389cedc 100755 --- a/script/test +++ b/script/test @@ -69,7 +69,8 @@ function prepareEnv (suiteName) { // Tell Jasmine to output this suite's results as a JUnit XML file to a subdirectory of the root, so that a // CI system can interpret it. const runPrefix = process.env.TEST_JUNIT_XML_RUN || '' - const outputPath = path.join(process.env.TEST_JUNIT_XML_ROOT, `${runPrefix}${suiteName}.xml`) + const filePath = (runPrefix.length > 0 ? runPrefix + ' ' : '') + suiteName + '.xml' + const outputPath = path.join(process.env.TEST_JUNIT_XML_ROOT, filePath) env.TEST_JUNIT_XML_PATH = outputPath } diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 3ecc2e96e..f5afabaff 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -26,7 +26,7 @@ jobs: CI_PROVIDER: VSTS ATOM_JASMINE_REPORTER: list TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - TEST_JUNIT_XML_RUN: "Linux " + TEST_JUNIT_XML_RUN: Linux displayName: Run tests condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index db9562b35..8afc8aaee 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -46,7 +46,7 @@ jobs: CI_PROVIDER: VSTS ATOM_JASMINE_REPORTER: list TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)/junit - TEST_JUNIT_XML_RUN: "MacOS " + TEST_JUNIT_XML_RUN: MacOS displayName: Run tests condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true')) diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index 4c5fa1eb4..37ca64168 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -71,7 +71,7 @@ jobs: CI_PROVIDER: VSTS ATOM_JASMINE_REPORTER: list TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit - TEST_JUNIT_XML_RUN: "Windows $(buildArch) " + TEST_JUNIT_XML_RUN: Windows $(buildArch) BUILD_ARCH: $(buildArch) displayName: Run tests condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))