Exit with code 2 on "expected" errors on lint, fmt, and test (#552)

jviotti · web-flow · commit 45fd7bea2e3a · 2025-11-21T17:54:10.000-04:00
Signed-off-by: Juan Cruz Viotti &lt;jv@jviotti.com&gt;
diff --git a/src/command_fmt.cc b/src/command_fmt.cc
@@ -96,6 +96,8 @@ auto sourcemeta::jsonschema::fmt(const sourcemeta::core::Options &options)
                 << "\n";
     }
 
-    throw Fail{EXIT_FAILURE};
+    // Report a different exit code for formatting check failures, to
+    // distinguish them from other errors
+    throw Fail{2};
   }
 }
diff --git a/src/command_lint.cc b/src/command_lint.cc
@@ -238,7 +238,8 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)
           output << "\n";
         }
       } else {
-        result = false;
+        // Exception was caught - exit immediately with error code 1
+        throw Fail{EXIT_FAILURE};
       }
     }
   } else {
@@ -263,7 +264,8 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)
               if (subresult.first) {
                 return EXIT_SUCCESS;
               } else {
-                return EXIT_FAILURE;
+                // Return 2 for logical lint failures
+                return 2;
               }
             } catch (const sourcemeta::core::SchemaUnknownBaseDialectError &) {
               throw FileError<sourcemeta::core::SchemaUnknownBaseDialectError>(
@@ -274,8 +276,12 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)
             }
           });
 
-      if (wrapper_result != EXIT_SUCCESS) {
+      if (wrapper_result == 2) {
+        // Logical lint failure
         result = false;
+      } else if (wrapper_result != EXIT_SUCCESS) {
+        // Exception was caught - exit immediately with error code 1
+        throw Fail{EXIT_FAILURE};
       }
     }
   }
@@ -299,6 +305,8 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)
   }
 
   if (!result) {
-    throw Fail{EXIT_FAILURE};
+    // Report a different exit code for linting failures, to
+    // distinguish them from other errors
+    throw Fail{2};
   }
 }
diff --git a/src/command_test.cc b/src/command_test.cc
@@ -250,6 +250,8 @@ auto sourcemeta::jsonschema::test(const sourcemeta::core::Options &options)
   }
 
   if (!result) {
-    throw Fail{EXIT_FAILURE};
+    // Report a different exit code for test failures, to
+    // distinguish them from other errors
+    throw Fail{2};
   }
 }
diff --git a/test/format/fail_check_many.sh b/test/format/fail_check_many.sh
@@ -30,7 +30,7 @@ cat << 'EOF' > "$TMP/schemas/3.json"
 EOF
 
 "$1" fmt "$TMP/schemas" --check >"$TMP/output.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/schemas/1.json
diff --git a/test/format/fail_check_many_json.sh b/test/format/fail_check_many_json.sh
@@ -30,7 +30,7 @@ cat << 'EOF' > "$TMP/schemas/3.json"
 EOF
 
 "$1" fmt "$TMP/schemas" --check --json >"$TMP/output.json" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.json"
 {
diff --git a/test/format/fail_check_single.sh b/test/format/fail_check_single.sh
@@ -15,7 +15,7 @@ cat << 'EOF' > "$TMP/schema.json"
 EOF
 
 "$1" fmt "$TMP/schema.json" --check >"$TMP/output.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/schema.json
diff --git a/test/format/fail_check_single_indentation.sh b/test/format/fail_check_single_indentation.sh
@@ -15,7 +15,7 @@ cat << 'EOF' > "$TMP/schema.json"
 EOF
 
 "$1" fmt "$TMP/schema.json" --indentation 4 --check >"$TMP/output.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 fail: $(realpath "$TMP")/schema.json
diff --git a/test/format/fail_check_single_json.sh b/test/format/fail_check_single_json.sh
@@ -18,7 +18,7 @@ EOF
 
 "$1" fmt "$TMP/this/is/a/very/very/very/long/path/schema.json" \
   --check --json >"$TMP/output.json" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.json"
 {
diff --git a/test/format/fail_check_single_json_indentation.sh b/test/format/fail_check_single_json_indentation.sh
@@ -18,7 +18,7 @@ EOF
 
 "$1" fmt "$TMP/this/is/a/very/very/very/long/path/schema.json" \
   --check --json --indentation 4 >"$TMP/output.json" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.json"
 {
diff --git a/test/lint/fail_lint.sh b/test/lint/fail_lint.sh
@@ -17,7 +17,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.json:4:3:
diff --git a/test/lint/fail_lint_default.sh b/test/lint/fail_lint_default.sh
@@ -21,7 +21,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.json:6:7:
diff --git a/test/lint/fail_lint_default_dialect.sh b/test/lint/fail_lint_default_dialect.sh
@@ -18,7 +18,7 @@ cd "$TMP"
 "$1" lint "$TMP/schema.json" \
   --default-dialect "http://json-schema.org/draft-04/schema#" \
   >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.json:3:3:
diff --git a/test/lint/fail_lint_default_dialect_config.sh b/test/lint/fail_lint_default_dialect_config.sh
@@ -23,7 +23,7 @@ EOF
 cd "$TMP"
 "$1" lint "$TMP/schema.json" --verbose \
   >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 Using configuration file: $(realpath "$TMP")/jsonschema.json
diff --git a/test/lint/fail_lint_default_dialect_config_relative.sh b/test/lint/fail_lint_default_dialect_config_relative.sh
@@ -23,7 +23,7 @@ EOF
 cd "$TMP"
 "$1" lint schema.json --verbose \
   >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 Using configuration file: $(realpath "$TMP")/jsonschema.json
diff --git a/test/lint/fail_lint_directory_json.sh b/test/lint/fail_lint_directory_json.sh
@@ -24,7 +24,7 @@ cat << 'EOF' > "$TMP/schemas/bar.json"
 EOF
 
 "$1" lint "$TMP/schemas" --json >"$TMP/output.json" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.json"
 {
diff --git a/test/lint/fail_lint_directory_unresolvable.sh b/test/lint/fail_lint_directory_unresolvable.sh
@@ -38,7 +38,6 @@ error: Could not resolve the reference to an external schema
   at file path $(realpath "$TMP")/baz.json
 
 This is likely because you forgot to import such schema using \`--resolve/-r\`
-Linting: $(realpath "$TMP")/foo.json
 EOF
 
 diff "$TMP/output.txt" "$TMP/expected.txt"
diff --git a/test/lint/fail_lint_directory_unresolvable_dialect.sh b/test/lint/fail_lint_directory_unresolvable_dialect.sh
@@ -36,7 +36,6 @@ error: Could not resolve the metaschema of the schema
   at file path $(realpath "$TMP")/baz.json
 
 This is likely because you forgot to import such schema using \`--resolve/-r\`
-Linting: $(realpath "$TMP")/foo.json
 EOF
 
 diff "$TMP/output.txt" "$TMP/expected.txt"
diff --git a/test/lint/fail_lint_directory_unresolvable_fix.sh b/test/lint/fail_lint_directory_unresolvable_fix.sh
@@ -38,7 +38,6 @@ error: Could not resolve the reference to an external schema
   at file path $(realpath "$TMP")/baz.json
 
 This is likely because you forgot to import such schema using \`--resolve/-r\`
-Linting: $(realpath "$TMP")/foo.json
 EOF
 
 diff "$TMP/output.txt" "$TMP/expected.txt"
diff --git a/test/lint/fail_lint_disable_many.sh b/test/lint/fail_lint_disable_many.sh
@@ -18,7 +18,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" --exclude enum_to_const -x enum_with_type >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.json:4:3:
diff --git a/test/lint/fail_lint_disable_one.sh b/test/lint/fail_lint_disable_one.sh
@@ -18,7 +18,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" --exclude enum_to_const >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.json:4:3:
diff --git a/test/lint/fail_lint_disable_one_verbose.sh b/test/lint/fail_lint_disable_one_verbose.sh
@@ -18,7 +18,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" --verbose --exclude enum_to_const >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 Disabling rule: enum_to_const
diff --git a/test/lint/fail_lint_disable_unknown_verbose.sh b/test/lint/fail_lint_disable_unknown_verbose.sh
@@ -18,7 +18,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" --verbose --exclude foo_bar >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 warning: Cannot exclude unknown rule: foo_bar
diff --git a/test/lint/fail_lint_examples.sh b/test/lint/fail_lint_examples.sh
@@ -21,7 +21,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.json:6:21:
diff --git a/test/lint/fail_lint_invalid_embedded_resource.sh b/test/lint/fail_lint_invalid_embedded_resource.sh
@@ -27,7 +27,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat "$TMP/stderr.txt"
 
diff --git a/test/lint/fail_lint_json.sh b/test/lint/fail_lint_json.sh
@@ -16,7 +16,7 @@ cat << 'EOF' > "$TMP/schema.json"
 EOF
 
 "$1" lint "$TMP/schema.json" --json >"$TMP/output.json" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.json"
 {
diff --git a/test/lint/fail_lint_only.sh b/test/lint/fail_lint_only.sh
@@ -18,7 +18,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.json:4:3:
diff --git a/test/lint/fail_lint_with_id.sh b/test/lint/fail_lint_with_id.sh
@@ -17,7 +17,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.json" >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << 'EOF' > "$TMP/expected.txt"
 schema.json:4:3:
diff --git a/test/lint/fail_lint_yaml.sh b/test/lint/fail_lint_yaml.sh
@@ -15,7 +15,7 @@ EOF
 
 cd "$TMP"
 "$1" lint "$TMP/schema.yaml" >"$TMP/stderr.txt" 2>&1 && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 schema.yaml:3:1:
diff --git a/test/test/fail_anyof.sh b/test/test/fail_anyof.sh
@@ -39,7 +39,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat "$TMP/output.txt"
 
diff --git a/test/test/fail_false_single_resolve.sh b/test/test/fail_false_single_resolve.sh
@@ -40,7 +40,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 $(realpath "$TMP")/test.json:
diff --git a/test/test/fail_false_single_resolve_verbose.sh b/test/test/fail_false_single_resolve_verbose.sh
@@ -40,7 +40,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" --verbose 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 Detecting schema resources from file: $(realpath "$TMP")/schema.json
diff --git a/test/test/fail_multi_resolve.sh b/test/test/fail_multi_resolve.sh
@@ -45,7 +45,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 $(realpath "$TMP")/test.json:
diff --git a/test/test/fail_multi_resolve_verbose.sh b/test/test/fail_multi_resolve_verbose.sh
@@ -45,7 +45,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" --verbose 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 Detecting schema resources from file: $(realpath "$TMP")/schema.json
diff --git a/test/test/fail_multi_test.sh b/test/test/fail_multi_test.sh
@@ -63,7 +63,7 @@ EOF
 
 "$1" test "$TMP/tests" --resolve "$TMP/schema.json" 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 $(realpath "$TMP")/tests/1.json:
diff --git a/test/test/fail_true_resolve_fragment.sh b/test/test/fail_true_resolve_fragment.sh
@@ -33,7 +33,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 $(realpath "$TMP")/test.json:
diff --git a/test/test/fail_true_single_resolve.sh b/test/test/fail_true_single_resolve.sh
@@ -40,7 +40,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 $(realpath "$TMP")/test.json:
diff --git a/test/test/fail_true_single_resolve_verbose.sh b/test/test/fail_true_single_resolve_verbose.sh
@@ -40,7 +40,7 @@ EOF
 
 "$1" test "$TMP/test.json" --resolve "$TMP/schema.json" --verbose 1> "$TMP/output.txt" 2>&1 \
   && CODE="$?" || CODE="$?"
-test "$CODE" = "1" || exit 1
+test "$CODE" = "2" || exit 1
 
 cat << EOF > "$TMP/expected.txt"
 Detecting schema resources from file: $(realpath "$TMP")/schema.json

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ auto sourcemeta::jsonschema::fmt(const sourcemeta::core::Options &options)`
`96`	`96`	`<< "\n";`
`97`	`97`	`}`
`98`	`98`
`99`		`- throw Fail{EXIT_FAILURE};`
	`99`	`+ // Report a different exit code for formatting check failures, to`
	`100`	`+ // distinguish them from other errors`
	`101`	`+ throw Fail{2};`
`100`	`102`	`}`
`101`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,8 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)`
`238`	`238`	`output << "\n";`
`239`	`239`	`}`
`240`	`240`	`} else {`
`241`		`- result = false;`
	`241`	`+ // Exception was caught - exit immediately with error code 1`
	`242`	`+ throw Fail{EXIT_FAILURE};`
`242`	`243`	`}`
`243`	`244`	`}`
`244`	`245`	`} else {`
`@@ -263,7 +264,8 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)`
`263`	`264`	`if (subresult.first) {`
`264`	`265`	`return EXIT_SUCCESS;`
`265`	`266`	`} else {`
`266`		`- return EXIT_FAILURE;`
	`267`	`+ // Return 2 for logical lint failures`
	`268`	`+ return 2;`
`267`	`269`	`}`
`268`	`270`	`} catch (const sourcemeta::core::SchemaUnknownBaseDialectError &) {`
`269`	`271`	`throw FileError<sourcemeta::core::SchemaUnknownBaseDialectError>(`
`@@ -274,8 +276,12 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)`
`274`	`276`	`}`
`275`	`277`	`});`
`276`	`278`
`277`		`- if (wrapper_result != EXIT_SUCCESS) {`
	`279`	`+ if (wrapper_result == 2) {`
	`280`	`+ // Logical lint failure`
`278`	`281`	`result = false;`
	`282`	`+ } else if (wrapper_result != EXIT_SUCCESS) {`
	`283`	`+ // Exception was caught - exit immediately with error code 1`
	`284`	`+ throw Fail{EXIT_FAILURE};`
`279`	`285`	`}`
`280`	`286`	`}`
`281`	`287`	`}`
`@@ -299,6 +305,8 @@ auto sourcemeta::jsonschema::lint(const sourcemeta::core::Options &options)`
`299`	`305`	`}`
`300`	`306`
`301`	`307`	`if (!result) {`
`302`		`- throw Fail{EXIT_FAILURE};`
	`308`	`+ // Report a different exit code for linting failures, to`
	`309`	`+ // distinguish them from other errors`
	`310`	`+ throw Fail{2};`
`303`	`311`	`}`
`304`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,8 @@ auto sourcemeta::jsonschema::test(const sourcemeta::core::Options &options)`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`if (!result) {`
`253`		`- throw Fail{EXIT_FAILURE};`
	`253`	`+ // Report a different exit code for test failures, to`
	`254`	`+ // distinguish them from other errors`
	`255`	`+ throw Fail{2};`
`254`	`256`	`}`
`255`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ cat << 'EOF' > "$TMP/schemas/3.json"`
`30`	`30`	`EOF`
`31`	`31`
`32`	`32`	`"$1" fmt "$TMP/schemas" --check --json >"$TMP/output.json" 2>&1 && CODE="$?" \|\| CODE="$?"`
`33`		`-test "$CODE" = "1" \|\| exit 1`
	`33`	`+test "$CODE" = "2" \|\| exit 1`
`34`	`34`
`35`	`35`	`cat << EOF > "$TMP/expected.json"`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ EOF`
`18`	`18`
`19`	`19`	`"$1" fmt "$TMP/this/is/a/very/very/very/long/path/schema.json" \`
`20`	`20`	`--check --json >"$TMP/output.json" 2>&1 && CODE="$?" \|\| CODE="$?"`
`21`		`-test "$CODE" = "1" \|\| exit 1`
	`21`	`+test "$CODE" = "2" \|\| exit 1`
`22`	`22`
`23`	`23`	`cat << EOF > "$TMP/expected.json"`
`24`	`24`	`{`