diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2019-11-15 17:29:15 -0500 |
---|---|---|
committer | Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-12-04 20:20:13 +0000 |
commit | f0797d130f82f751c1657e40e203eeb26f7aa3da (patch) | |
tree | 9bdcb2d62a3516c2dbfcf45fc2806f63a4185696 /test/test_vapi.py | |
parent | c9cb8f6d9c6e1f51dfdf3e9f4ba0c9f38d1ca6d6 (diff) |
build: fix make test with distributed src
This patch addresses the functionality that is
missing for distributed make test source files.
In addition it extends the concept of colocating
test source code with functional source code
(eg. src/vcl/test). It also cleans up deficiencies
in the make test makefiles.
NOTE: Due to the way sphinx document tools work,
all test, all of the make test python code is
gathered using soft links into the directory:
.../build-root/build-test/src
Change summary:
- Remove 'make test' help details from
main makefile help output to reduce clutter
and redundant help output
- Move all generated build output to
.../build-root/build-test
- Move test_vcl.py as first usecase for
distributed core feature make test code
- Add test-wipe-all target and fix wipe targets
to remove all generated files
- Fix 'make test-doc' to generate module
documentation for all source files
- Remove unused targets in test/doc/Makefile
- Fix 'make test-shell'
- Fix test/ext Makefile to not generate
bogus output
Type: fix
Fixes: a43c93f8554ad7418e31be3791b3fb71232f60ac
Change-Id: Icc2ddb81d474081c3ede4548ecd7a0624651f62d
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'test/test_vapi.py')
-rw-r--r-- | test/test_vapi.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_vapi.py b/test/test_vapi.py index 5dbe56ac6e2..1a4293d7888 100644 --- a/test/test_vapi.py +++ b/test/test_vapi.py @@ -20,11 +20,11 @@ class VAPITestCase(VppTestCase): def test_vapi_c(self): """ run C VAPI tests """ - var = "TEST_DIR" + var = "TEST_BR" built_root = os.getenv(var, None) self.assertIsNotNone(built_root, "Environment variable `%s' not set" % var) - executable = "%s/build/vapi_test/vapi_c_test" % built_root + executable = "%s/vapi_test/vapi_c_test" % built_root worker = Worker( [executable, "vapi client", self.shm_prefix], self.logger) worker.start() @@ -50,11 +50,11 @@ class VAPITestCase(VppTestCase): @unittest.skipIf(running_on_centos, "Centos's gcc can't compile our C++") def test_vapi_cpp(self): """ run C++ VAPI tests """ - var = "TEST_DIR" + var = "TEST_BR" built_root = os.getenv(var, None) self.assertIsNotNone(built_root, "Environment variable `%s' not set" % var) - executable = "%s/build/vapi_test/vapi_cpp_test" % built_root + executable = "%s/vapi_test/vapi_cpp_test" % built_root worker = Worker( [executable, "vapi client", self.shm_prefix], self.logger) worker.start() |