ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: restore vapi C++ test under Centos-8

Browse Source 
The Centos-7 compiler had problems with vapi_cpp_test.cpp.
The Centos-8 compiler does not.  This change adds back the test.

==============================================================================
VAPI test
==============================================================================
run C VAPI tests                                                     1.55 OK
run C++ VAPI tests                                                   0.44 OK

==============================================================================
TEST RESULTS:
     Scheduled tests: 2
      Executed tests: 2
        Passed tests: 2
==============================================================================

Type: test

Change-Id: Ic6a655ae99eb3ba0e73b7feef4436a0ca5fd92be
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2020-12-07 02:46:31 +00:00
committed by Dave Wallace
parent 5c544c8c3e
commit bb3befceee
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vpp-api/test/test_vapi.py
View File

@ -4,7 +4,7 @@
import unittest
import os
import signal
from framework import VppTestCase, running_on_centos, VppTestRunner, Worker
from framework import VppTestCase, VppTestRunner, Worker
class VAPITestCase(VppTestCase):
@ -47,7 +47,6 @@ class VAPITestCase(VppTestCase):
"Timeout! Worker did not finish in %ss" % timeout)
self.assert_equal(worker.result, 0, "Binary test return code")
@unittest.skipIf(running_on_centos, "Centos's gcc can't compile our C++")
def test_vapi_cpp(self):
""" run C++ VAPI tests """
var = "TEST_BR"

2
test/ext/Makefile
View File

@ -33,7 +33,7 @@ $(VAPI_CBIN).d: $(CSRC) $(VAPI_BINDIR)/fake.api.vapi.h
$(CC) -o $@ $(CFLAGS) -MM -MT '$(VAPI_CBIN)' $(CSRC) > $@
ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID) AND $(OS_VERSION_ID),7)
VAPI_CPPBIN=
else
CPPSRC = $(TEST_EXT_DIR)/vapi_cpp_test.cpp

8
test/framework.py
View File

@ -219,14 +219,6 @@ def _running_gcov_tests():
running_gcov_tests = _running_gcov_tests()
def _running_on_centos():
os_id = os.getenv("OS_ID", "")
return True if "centos" in os_id.lower() else False
running_on_centos = _running_on_centos()
class KeepAliveReporter(object):
"""
Singleton object which reports test start to parent process