summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/stratum-overlap-warns.script12
-rw-r--r--tests/stratum-overlap-warns.stdout5
2 files changed, 11 insertions, 6 deletions
diff --git a/tests/stratum-overlap-warns.script b/tests/stratum-overlap-warns.script
index edb1d855..2e9965fe 100755
--- a/tests/stratum-overlap-warns.script
+++ b/tests/stratum-overlap-warns.script
@@ -21,8 +21,18 @@
set -eu
log="$DATADIR/morph.log"
+warnings="$DATADIR/warnings"
cache="$DATADIR/cache/artifacts"
+warning_mentions(){
+ grep -F "$1" <"$warnings" >/dev/null 2>/dev/null
+}
+
"$SRCDIR/scripts/test-morph" \
build --log=$log test:morphs-repo overlap overlap-stratum.morph
-grep WARNING $log | sed 's/^.*WARNING/WARNING/'
+grep WARNING "$log" >"$warnings"
+for str in overlap-stratum \
+ overlap-foo-baz overlap-foobar bin/bar \
+ overlap-fooqux bin/foo; do
+ warning_mentions 'overlap-stratum' || exit $?
+done
diff --git a/tests/stratum-overlap-warns.stdout b/tests/stratum-overlap-warns.stdout
deleted file mode 100644
index eaddf9c1..00000000
--- a/tests/stratum-overlap-warns.stdout
+++ /dev/null
@@ -1,5 +0,0 @@
-WARNING Overlaps in artifact overlap-stratum detected
-WARNING Artifacts overlap-foo-baz, overlap-foobar overlap with files:
-WARNING bin/bar
-WARNING Artifacts overlap-foo-baz, overlap-foobar, overlap-fooqux overlap with files:
-WARNING bin/foo