commit 2cea6a01a57a8f1ad71ba9cf838186d62987d30a
author Mike Marchetti <mmarchetti@sandvine.com> Fri Oct 13 13:58:54 2017 -0400
committer Mike Marchetti <mmarchetti@sandvine.com> Fri Oct 13 13:58:54 2017 -0400
tree d9f6c030102d4a2ffad684440c75d01014833995
parent 8d38950dbdd0459d78fef2c594236e03d7945e66

bug 381 fix

- fixup ping_pong Makefile
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>

systest/Makefile

diff --git a/systest/Makefile b/systest/Makefile
index ce5c68a..90c56d5 100644
--- a/systest/Makefile
+++ b/systest/Makefile
@@ -140,12 +140,15 @@
 $(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/%.tar.gz:
 	$(MAKE) -C $(DESCRIPTOR_DIR)/vnfd/pong_vnf
 
-$(DESCRIPTOR_DIR)/vnfd/ping_pong_ns/build/%.tar.gz:
+$(DESCRIPTOR_DIR)/nsd/ping_pong_ns/build/%.tar.gz:
 	$(MAKE) -C $(DESCRIPTOR_DIR)/nsd/ping_pong_ns
 
-ping_pong: check_OSM_HOSTNAME check_openstack_env
+ping_pong: check_OSM_HOSTNAME check_openstack_env \
+    $(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/ping_vnf.tar.gz \
+    $(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/pong_vnf.tar.gz \
+    $(DESCRIPTOR_DIR)/nsd/ping_pong_ns/build/ping_pong_ns.tar.gz
 	$(Q)$(MAKE) \
-        TEST_VNFD_DESCRIPTORS="$(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/ping_vnf.tar.gz $(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/pong_vnf.tar.gz" \
+        TEST_VNFD_DESCRIPTORS="$(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/ping_vnf.tar.gz,$(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/pong_vnf.tar.gz" \
         TEST_NSD_DESCRIPTORS=$(DESCRIPTOR_DIR)/nsd/ping_pong_ns/build/ping_pong_ns.tar.gz \
         JUNITXML=pytest-$@.xml \
         PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m vnf" _run_test