fix paths + add diagnostic output on failure

Azure · Jan 9, 2023 · 846e620 · 846e620
1 parent d01f239
commit 846e620
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/eng/common-tests/matrix-generator/tests/job-matrix-functions.modification.tests.ps1 b/eng/common-tests/matrix-generator/tests/job-matrix-functions.modification.tests.ps1
@@ -88,7 +88,7 @@ Describe "Platform Matrix nonSparse" -Tag "UnitTest", "nonsparse" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "TestField1": "test1"
     },
     "exclude": [ { "Baz": "importedBaz" } ]
@@ -130,7 +130,7 @@ Describe "Platform Matrix Import" -Tag "UnitTest", "import" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json"
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json"
     },
     "include": [
         {
@@ -173,7 +173,7 @@ Describe "Platform Matrix Import" -Tag "UnitTest", "import" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "TestField1": "test1",
         "TestField2": "test2"
     },
@@ -206,7 +206,7 @@ Describe "Platform Matrix Import" -Tag "UnitTest", "import" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "testField": [ "test1", "test2" ]
     }
 }
@@ -235,7 +235,7 @@ Describe "Platform Matrix Import" -Tag "UnitTest", "import" {
         "importedBaz": "importedBazNameOverride"
     },
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "testField": [ "test1", "test2" ]
     }
 }
@@ -251,7 +251,7 @@ Describe "Platform Matrix Import" -Tag "UnitTest", "import" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "testField1": [ "test11", "test12" ],
         "testField2": [ "test21", "test22" ]
     }
@@ -299,7 +299,7 @@ Describe "Platform Matrix Import" -Tag "UnitTest", "import" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "testField": [ "test1", "test2", "test3" ],
     },
     "include": [
@@ -364,7 +364,7 @@ Describe "Platform Matrix Import" -Tag "UnitTest", "import" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "Foo": [ "fooOverride1", "fooOverride2" ],
     }
 }
@@ -450,7 +450,7 @@ Describe "Platform Matrix Replace" -Tag "UnitTest", "replace" {
         $matrixJson = @'
 {
     "matrix": {
-        "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+        "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
         "testField": [ "test1", "test2" ]
     }
 }
@@ -550,7 +550,7 @@ Describe "Platform Matrix Replace" -Tag "UnitTest", "replace" {
     "replaceme": ""
   },
   "matrix": {
-    "$IMPORT": "./eng/common/scripts/job-matrix/tests/test-import-matrix.json",
+    "$IMPORT": "./matrix-generator/tests/test-import-matrix.json",
     "replaceme": "replaceme"
   }
 }

diff --git a/eng/common/scripts/job-matrix/job-matrix-functions.ps1 b/eng/common/scripts/job-matrix/job-matrix-functions.ps1
@@ -380,7 +380,7 @@ function ProcessImport([MatrixParameter[]]$matrix, [String]$selection, [Array]$n
     }
 
     if (!(Test-Path $importPath)) {
-        Write-Error "`$IMPORT path '$importPath' does not exist."
+        Write-Error "`$IMPORT path '$importPath' does not exist. Current dir: $(Get-Location)"
         exit 1
     }
     $importedMatrixConfig = GetMatrixConfigFromFile (Get-Content -Raw $importPath)