From: marchettim <mmarchetti@sandvine.com>
Date: Wed, 21 Feb 2018 15:35:28 +0000 (+0100)
Subject: Merge "Make option for test functionality added to tool to upgrade vnf,ns descriptors... 
X-Git-Tag: v3.0.3~8
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c3733e1cfa5e981130a698a1b8563a98ba3058fd;p=osm%2Fdevops.git

Merge "Make option for test functionality added to tool to upgrade vnf,ns descriptors to R. THREE"
---

c3733e1cfa5e981130a698a1b8563a98ba3058fd
diff --cc descriptor-packages/mk/dirs.mk
index 8e9ceda6,b3df4056..8e007878
--- a/descriptor-packages/mk/dirs.mk
+++ b/descriptor-packages/mk/dirs.mk
@@@ -14,8 -14,10 +14,11 @@@
  #   limitations under the License.
  #
  
+ TOPDIR=$(shell readlink -f .|sed -e 's/\/descriptor-packages\/.*//')
+ TOOLS_DIR := $(TOPDIR)/tools
+ 
  SUBDIRS_CLEAN = $(addsuffix .clean, $(SUBDIRS))
 +SUBDIRS_TEST = $(addsuffix .test, $(SUBDIRS))
  
  .PHONY: $(SUBDIRS) $(SUBDIRS_CLEAN) clean
  
@@@ -28,8 -28,8 +31,11 @@@ test: $(SUBDIRS_TEST
  $(SUBDIRS_CLEAN): %.clean:
  	@$(MAKE) --no-print-directory -C $* clean
  
 +$(SUBDIRS_TEST): %.test:
 +	@$(MAKE) --no-print-directory -C $* test
 +
  $(SUBDIRS):
  	@$(MAKE) --no-print-directory -C $@
+ 
+ test:
+ 	$(TOOLS_DIR)/launch_tests.sh