From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Oct 2016 12:44:10 +0000 (+0100)
Subject: Test suite: bm-*: turn bm-report-source into bm-report-test
X-Git-Tag: archive/debian/2.8~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4e73f0c77e0a5c679a39c5e78f67adbb217d5922

Test suite: bm-*: turn bm-report-source into bm-report-test

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 4b0f944f..00f3a034 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -97,11 +97,12 @@ bm-quirk-sbuild-after-act () {
 	fi
 }
 
-bm-report-source () {
+bm-report-test () {
+	local desc=$1; shift
 	if "$@"; then
-		echo >&4 "SOURCE EXISTS"
+		echo >&4 "$desc EXISTS"
 	else
-		echo >&4 "SOURCE MISSING"
+		echo >&4 "$desc MISSING"
 	fi
 }
 
@@ -141,7 +142,7 @@ bm-compute-expected () {
 		echo >&4 "EXAMPLE RULES TARGET $t"
 	done
 
-	bm-report-source $e_source
+	bm-report-test "SOURCE FILE" $e_source
 
 	exec 4>&-
 }
@@ -191,7 +192,7 @@ bm-run-one () {
 
 	egrep >&4 '^EXAMPLE RULES TARGET|^BUILD-MODES' $bmlog || [ $? = 1 ]
 
-	bm-report-source [ -e $dsc ]
+	bm-report-test "SOURCE FILE" [ -e $dsc ]
 
 	exec 4>&-