Change in ...osmo-gsm-manuals[master]: tests: pick up subdirs inside common/chapters

laforge gerrit-no-reply at lists.osmocom.org
Mon Jul 22 19:49:16 UTC 2019


laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/14895 )

Change subject: tests: pick up subdirs inside common/chapters
......................................................................

tests: pick up subdirs inside common/chapters

The Osmux documentation that will be introduced in [1] creates a
common/chapters/osmux/ subdir. Update tests/Makefile.am to pick up the
files in that directory too, so they get built by jenkins during gerrit
verification.

[1] I182d94c63f7d74ef882b77be59a95b1b7d8a4e5e
Change-Id: I4d1f440b7bfef159c98f918a2d23069594c4bc95
---
M tests/Makefile.am
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7dc9544..b2f579d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,8 @@
 # Generate adoc file that includes all chapters
 ASCIIDOC = test-usermanual.adoc
 ASCIIDOC_DEPS =
-$(ASCIIDOC): $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc
+COMMON_CHAPTERS = $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name '*.adoc')
+$(ASCIIDOC): $(COMMON_CHAPTERS)
 	echo ":gfdl-enabled:" > $@
 	echo ":program-name: Test" >> $@
 	echo "" >> $@
@@ -17,7 +18,7 @@
 	echo "====================================" >> $@
 	echo "Oliver Smith <osmith at sysmocom.de>" >> $@
 	echo "" >> $@
-	for chapter in $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc; do \
+	for chapter in $(COMMON_CHAPTERS); do \
 		echo "include::$${chapter}[]" >> $@; \
 	done;
 CLEAN_FILES = $(ASCIIDOC)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/14895
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I4d1f440b7bfef159c98f918a2d23069594c4bc95
Gerrit-Change-Number: 14895
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190722/ac1673e8/attachment.html>


More information about the gerrit-log mailing list