benchmark: skip (don't fail) needs_repo tests

ethomson · ethomson · commit e68d0b4b955c · 2024-10-21T17:29:52.000+01:00
If a test needs a repo that isn't provide it, mark it as skipped and
avoid failing the execution.
diff --git a/tests/benchmarks/benchmark.sh b/tests/benchmarks/benchmark.sh
@@ -213,9 +213,19 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 	ERROR_FILE="${OUTPUT_DIR}/${TEST_FILE}.err"
 
 	FAILED=
-	${TEST_PATH} --cli "${TEST_CLI}" --baseline-cli "${BASELINE_CLI}" --json "${JSON_FILE}" ${SHOW_OUTPUT} >"${OUTPUT_FILE}" 2>"${ERROR_FILE}" || FAILED=1
+	{
+	  ${TEST_PATH} --cli "${TEST_CLI}" --baseline-cli "${BASELINE_CLI}" --json "${JSON_FILE}" ${SHOW_OUTPUT} >"${OUTPUT_FILE}" 2>"${ERROR_FILE}";
+	  FAILED=$?
+	} || true
 
-	if [ "${FAILED}" = "1" ]; then
+	if [ "${FAILED}" = "2" ]; then
+		if [ "${VERBOSE}" != "1" ]; then
+			echo "skipped!"
+		fi
+
+		indent < "${ERROR_FILE}"
+		continue
+	elif [ "${FAILED}" != "0" ]; then
 		if [ "${VERBOSE}" != "1" ]; then
 			echo "failed!"
 		fi
diff --git a/tests/benchmarks/benchmark_helpers.sh b/tests/benchmarks/benchmark_helpers.sh
@@ -408,6 +408,6 @@ needs_repo() {
 		echo "remote repository ('${REPO_REMOTE_URL}') locally then set," 1>&2
 		echo "the 'BENCHMARK_${REPO_UPPER}_REPOSITORY' environment variable to the path that" 1>&2
 		echo "contains the repository locally, then run this benchmark again." 1>&2
-		exit 1
+		exit 2
 	fi
 }

Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,6 @@ needs_repo() {`
`408`	`408`	`echo "remote repository ('${REPO_REMOTE_URL}') locally then set," 1>&2`
`409`	`409`	`echo "the 'BENCHMARK_${REPO_UPPER}_REPOSITORY' environment variable to the path that" 1>&2`
`410`	`410`	`echo "contains the repository locally, then run this benchmark again." 1>&2`
`411`		`- exit 1`
	`411`	`+ exit 2`
`412`	`412`	`fi`
`413`	`413`	`}`