[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 03/04: [tests]: Parallelize use of artifacts.
From: |
G. Branden Robinson |
Subject: |
[groff] 03/04: [tests]: Parallelize use of artifacts. |
Date: |
Fri, 25 Mar 2022 09:35:41 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit aa22079b98036c39822726e0179306fff1b8442f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Mar 25 18:25:03 2022 +1100
[tests]: Parallelize use of artifacts.
---
contrib/mm/tests/remove-stale-bib-entry-data.sh | 4 ++--
src/preproc/refer/tests/report-correct-line-numbers.sh | 2 +-
.../groff/tests/fp_should_not_traverse_directories.sh | 17 +++++++++--------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/contrib/mm/tests/remove-stale-bib-entry-data.sh
b/contrib/mm/tests/remove-stale-bib-entry-data.sh
index feac7d9e..5fb68e6b 100755
--- a/contrib/mm/tests/remove-stale-bib-entry-data.sh
+++ b/contrib/mm/tests/remove-stale-bib-entry-data.sh
@@ -28,9 +28,9 @@ wail () {
}
# Regression-test Savannah #60657. Ensure data from a bibliographic
-# entry doesn't carry over to the next.
+# entry don't carry over to the next.
-# Locate our test artifacts.
+# Locate directory containing our test artifacts.
artifact_dir=
for buildroot in . .. ../..
diff --git a/src/preproc/refer/tests/report-correct-line-numbers.sh
b/src/preproc/refer/tests/report-correct-line-numbers.sh
index 06b02806..a9065e0a 100755
--- a/src/preproc/refer/tests/report-correct-line-numbers.sh
+++ b/src/preproc/refer/tests/report-correct-line-numbers.sh
@@ -30,7 +30,7 @@ wail () {
# Regression-test Savannah #62124. Ensure correct line numbers in
# diagnostics on bibliography files.
-# Locate our test artifacts.
+# Locate directory containing our test artifacts.
artifact_dir=
for buildroot in . .. ../..
diff --git a/src/roff/groff/tests/fp_should_not_traverse_directories.sh
b/src/roff/groff/tests/fp_should_not_traverse_directories.sh
index d809b76d..f60f42fc 100755
--- a/src/roff/groff/tests/fp_should_not_traverse_directories.sh
+++ b/src/roff/groff/tests/fp_should_not_traverse_directories.sh
@@ -25,12 +25,12 @@ groff="${abs_top_builddir:-.}/test-groff"
# The `fp` request should not be able to access font description files
# outside of the device and font description search path (configurable
# with the -F option and GROFF_FONT_PATH environment variable).
-
+#
# An absolute file name _won't_ work: it gets dev\*[.T]/ stuck on the
-# front of it by libgroff. (We have no idea where in a file system we
-# might be getting built anyway.) So we hunt around for our test
-# artifact directory in some common locations.
-font_dir=
+# front of it by libgroff.
+#
+# Locate directory containing our test artifacts.
+artifact_dir=
base=src/roff/groff/tests
device=artifacts
@@ -39,13 +39,13 @@ do
d=$buildroot/$base/$device
if [ -d "$d" ]
then
- font_dir=$d
+ artifact_dir=$d
break
fi
done
# If we can't find it, we can't test.
-test -z "$font_dir" && exit 77 # skip
+test -z "$artifact_dir" && exit 77 # skip
input='.fp 5 ../HONEYPOT
.ft 5
@@ -56,7 +56,8 @@ word
my word is able
.pl \n[nl]u'
-output=$(printf "%s" "$input" | "$groff" -b -ww -F "$font_dir" -Tascii)
+output=$(printf "%s" "$input" | "$groff" -b -ww -F "$artifact_dir" \
+ -Tascii)
echo "$output" | grep -Fx word
# vim:set ai et sw=4 ts=4 tw=72:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 03/04: [tests]: Parallelize use of artifacts.,
G. Branden Robinson <=