diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2020-12-07 02:46:31 +0000 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2020-12-08 20:04:17 +0000 |
| commit | bb3befceee2b9849c236f712e6991a92224b5136 (patch) | |
| tree | 31c505ff24207a112fcddf5063a81683bb1cbcfa | |
| parent | 5c544c8c3e084f7ccad041d168b6fff736b46cba (diff) | |
tests: restore vapi C++ test under Centos-8
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>
| -rw-r--r-- | src/vpp-api/test/test_vapi.py | 3 | ||||
| -rw-r--r-- | test/ext/Makefile | 2 | ||||
| -rw-r--r-- | test/framework.py | 8 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/vpp-api/test/test_vapi.py b/src/vpp-api/test/test_vapi.py index 1a4293d7888..09f9f83e984 100644 --- a/src/vpp-api/test/test_vapi.py +++ b/src/vpp-api/test/test_vapi.py @@ -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" diff --git a/test/ext/Makefile b/test/ext/Makefile index 9c9791b1364..bc2061446f4 100644 --- a/test/ext/Makefile +++ b/test/ext/Makefile @@ -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 diff --git a/test/framework.py b/test/framework.py index 970c42de809..f5775134ded 100644 --- a/test/framework.py +++ b/test/framework.py @@ -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 |