Merge pull request #16602 from ben-albrecht/mason-no-deps-bug-fix

Fix mason bug that occurred Mason.toml has no dependencies table

Fix a regression where lacking a `[dependencies]` table produced an error during `mason update` (called by `mason build`, `mason test`, etc.)

Also, added a test for this behavior.

- [x] local testing of `test/mason`

[Reviewed by @daviditen]

test/mason/build/CLEANFILES

@@ -0,0 +1 @@
+../CLEANFILES

test/mason/build/COMPOPTS

@@ -0,0 +1 @@
+../COMPOPTS

test/mason/build/EXECENV

@@ -0,0 +1 @@
+../EXECENV

test/mason/build/SKIPIF

@@ -0,0 +1 @@
+../SKIPIF

test/mason/build/_noDeps/.gitignore

@@ -0,0 +1,2 @@
+target/
+Mason.lock

test/mason/build/_noDeps/Mason.toml

@@ -0,0 +1,6 @@
+[brick]
+name = "noDeps"
+version = "0.1.0"
+chplVersion = "1.24.0"
+license = "None"
+

test/mason/build/_noDeps/src/noDeps.chpl

@@ -0,0 +1,4 @@
+/* Documentation for noDeps */
+module noDeps {
+  writeln("New library: noDeps");
+}

test/mason/build/noDeps.chpl

@@ -0,0 +1,24 @@
+/* Test a package with Manifest.toml without [dependencies] table */
+use MasonBuild;
+use MasonNew;
+use MasonUtils;
+
+use FileSystem;
+use SysCTypes;
+
+extern proc setenv(name : c_string, envval : c_string, overwrite : c_int) : c_int;
+
+// chdir and reset PWD env (some mason internals rely on this)
+proc changeDir(relPath: string) {
+  const oldPWD = getEnv('PWD');
+  here.chdir(relPath);
+  const newPWD = '/'.join(oldPWD, relPath);
+  setenv("PWD", newPWD.c_str(), 1);
+}
+
+proc main() {
+  const package = '_noDeps';
+  changeDir(package);
+  const args = ["mason", "build"];
+  masonBuild(args);
+}

test/mason/build/noDeps.cleanfiles

@@ -0,0 +1 @@
+_noDeps/target

test/mason/build/noDeps.good

@@ -0,0 +1,4 @@
+Skipping registry update since no dependency found in manifest file.
+Compiling [debug] target: noDeps
+Build Successful
+

tools/mason/MasonUpdate.chpl

@@ -86,9 +86,17 @@ proc updateLock(skipUpdate: bool, tf="Mason.toml", lf="Mason.lock") {
     const lockPath = projectHome + "/" + lf;
     const openFile = openreader(tomlPath);
     const TomlFile = parseToml(openFile);
+    var updated = false;
     if isFile(tomlPath) {
-      if TomlFile['dependencies']!.A.size > 0 then updateRegistry(skipUpdate);
-      else writeln("Skipping registry update since no dependency found in manifest file.");
+      if TomlFile.pathExists('dependencies') {
+        if TomlFile['dependencies']!.A.size > 0 {
+          updateRegistry(skipUpdate);
+          updated = true;
+        }
+      }
+      if !updated {
+        writeln("Skipping registry update since no dependency found in manifest file.");
+      }
     }
     if isDir(SPACK_ROOT) && TomlFile.pathExists('external') {
       if getSpackVersion != spackVersion then