osmith submitted this change.

View Change


Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved
ttcn3-bts-test: abort if missing osmo-config-merge

Change-Id: I9cea4affac0b3981c88078581a070f98649da667
---
M ttcn3-bts-test/Makefile
1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile
index a6fc200..fc6f3f8 100644
--- a/ttcn3-bts-test/Makefile
+++ b/ttcn3-bts-test/Makefile
@@ -12,8 +12,10 @@
oml/osmo-bts.gen.cfg \
fh/osmo-bsc.gen.cfg

-.PHONY: cfg
-cfg: $(CFG_SRC_FILES) $(CFG_GEN_FILES)
+.PHONY: req-osmo-config-merge cfg
+req-osmo-config-merge:
+ command -v osmo-config-merge
+cfg: req-osmo-config-merge $(CFG_SRC_FILES) $(CFG_GEN_FILES)

# Ensure that we always fetch up-to-date configuration files.
# See https://www.gnu.org/software/make/manual/make.html#Force-Targets

To view, visit change 36446. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667
Gerrit-Change-Number: 36446
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged