diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-02-22 14:47:00 +0100 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2018-02-22 17:55:39 +0000 |
| commit | cae7134a8c23b2ae3bb742b12789e5572aabf73d (patch) | |
| tree | 4c36ca6db9a5ffef5e8e55f1c7a3042fc71e436c | |
| parent | aba98ded5f552ae03704836acfecbd9db8872fed (diff) | |
make test: build test/ext when doing coverage
This makes VAPI/VOM tests part of code coverage report.
Change-Id: I66511b0a59880c2a64daecd37088268bdf5e1269
Signed-off-by: Klement Sekera <ksekera@cisco.com>
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/test_vapi.py | 6 | ||||
| -rw-r--r-- | test/test_vom.py | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/test/Makefile b/test/Makefile index a2a46d65d61..3bd8bd00a3b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -172,7 +172,7 @@ doc: verify-python-path $(PIP_PATCH_DONE) wipe-doc: @make -C doc wipe BR=$(BR) -cov: wipe-cov reset verify-python-path $(PAPI_INSTALL_DONE) +cov: wipe-cov reset ext verify-python-path $(PAPI_INSTALL_DONE) @lcov --zerocounters --directory $(VPP_TEST_BUILD_DIR) @test -z "$(EXTERN_COV_DIR)" || lcov --zerocounters --directory $(EXTERN_COV_DIR) $(call retest-func) diff --git a/test/test_vapi.py b/test/test_vapi.py index b5820fa181b..50a34df01fe 100644 --- a/test/test_vapi.py +++ b/test/test_vapi.py @@ -4,9 +4,6 @@ import unittest import os import signal -import subprocess -from threading import Thread -from log import single_line_delim from framework import VppTestCase, running_extended_tests, \ running_on_centos, VppTestRunner, Worker @@ -37,7 +34,8 @@ class VAPITestCase(VppTestCase): os.killpg(os.getpgid(worker.process.pid), signal.SIGTERM) worker.join() except: - raise Exception("Couldn't kill worker-spawned process") + self.logger.debug("Couldn't kill worker-spawned process") + raise if error: raise Exception( "Timeout! Worker did not finish in %ss" % timeout) diff --git a/test/test_vom.py b/test/test_vom.py index bfd7007fbec..3df8fe8dae2 100644 --- a/test/test_vom.py +++ b/test/test_vom.py @@ -4,11 +4,8 @@ import unittest import os import signal -import subprocess -from threading import Thread -from log import single_line_delim from framework import VppTestCase, running_extended_tests, \ - running_on_centos, VppTestRunner, Worker + VppTestRunner, Worker @unittest.skipUnless(running_extended_tests(), "part of extended tests") |