summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMarco Varlese <marco.varlese@suse.com>2017-10-10 16:43:14 +0200
committerDave Wallace <dwallacelf@gmail.com>2017-10-12 15:08:04 +0000
commit5f1231c5c2ba8483d1b723762d7001ee48956205 (patch)
treeee727cdefa3acb78b27a5effae1896a5d07852de /test
parent9a6fcef43c3263d6acb95aaca2dcd2eb86169a75 (diff)
Remove libsubunit 'dependency' for openSUSE and fix NASM
This patch addresses the unrequired dependency on libsubunit for opensuse; it also adds the required new dependency on check (add check-devel to the top-level Makefile). It adds some extra logic to install the correct NASM version to support AESNI. Change-Id: Ie368dd8f8485a67ab125e735fd12cbe25b9b588f Signed-off-by: Marco Varlese <marco.varlese@suse.com>
Diffstat (limited to 'test')
-rw-r--r--test/ext/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/ext/Makefile b/test/ext/Makefile
index 6436302f731..1bd035daa13 100644
--- a/test/ext/Makefile
+++ b/test/ext/Makefile
@@ -6,7 +6,10 @@ ifeq ($(filter centos,$(OS_ID)),$(OS_ID))
CPPBIN=
endif
-LIBS = -L$(VPP_TEST_BUILD_DIR)/vpp/.libs/ -L$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lsubunit -lrt -lm -lvapiclient
+LIBS = -L$(VPP_TEST_BUILD_DIR)/vpp/.libs/ -L$(VPP_TEST_BUILD_DIR)/vpp/vpp-api/vapi/.libs/ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient
+ifneq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+LIBS += -lsubunit
+endif
CFLAGS = -std=gnu99 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(BINDIR)
CPPFLAGS = -std=c++11 -g -Wall -pthread -I$(WS_ROOT)/src -I$(VPP_TEST_INSTALL_PATH)/vpp/include -I$(BINDIR)