Change in osmo-gsm-manuals[master]: fix tests/Makefile.am: exclude file 'mgcp_extension_osmux.adoc'

fixeria gerrit-no-reply at lists.osmocom.org
Sat Apr 10 02:47:55 UTC 2021


fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23693 )


Change subject: fix tests/Makefile.am: exclude file 'mgcp_extension_osmux.adoc'
......................................................................

fix tests/Makefile.am: exclude file 'mgcp_extension_osmux.adoc'

This file is included by 'osmux.adoc', so we end up including it
twice in 'test-usermanual.adoc'.  This makes xsltproc complain:

  /build/tests/test-usermanual.xml:643: element section:
    validity error : ID mgcp-extension-osmux already defined

and sometimes causes sporadic build failures.  Exclude it.

Change-Id: I00efafc822f46126b59d20e86bb07ec991768c28
Related: OS#5112
---
M tests/Makefile.am
1 file changed, 3 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/93/23693/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 641b35c..1be6308 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,9 @@
 # Generate adoc file that includes all chapters (OS#4183: glossary.adoc must be the last file)
 ASCIIDOC = test-usermanual.adoc
 ASCIIDOC_DEPS =
-COMMON_CHAPTERS = $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name '*.adoc' | grep -v glossary\.adoc) \
+COMMON_CHAPTERS = $(shell find $(OSMO_GSM_MANUALS_DIR)/common/chapters -name '*.adoc' \
+			! -name glossary.adoc \
+			! -name mgcp_extension_osmux.adoc) \
 		  $(OSMO_GSM_MANUALS_DIR)/common/chapters/glossary.adoc
 $(ASCIIDOC): $(COMMON_CHAPTERS)
 	echo ":gfdl-enabled:" > $@

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23693
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: I00efafc822f46126b59d20e86bb07ec991768c28
Gerrit-Change-Number: 23693
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210410/fd96434b/attachment.htm>


More information about the gerrit-log mailing list