tests: make VPP_BUILD_DIR to point to correct dir

[vpp.git] / test / test_vapi.py

diff --git a/test/test_vapi.py b/test/test_vapi.py
index 5dbe56a..106c84a 100644 (file)
--- a/test/test_vapi.py
+++ b/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):
@@ -20,13 +20,13 @@ class VAPITestCase(VppTestCase):
 
     def test_vapi_c(self):
         """ run C VAPI tests """
-        var = "TEST_DIR"
-        built_root = os.getenv(var, None)
-        self.assertIsNotNone(built_root,
+        var = "VPP_BUILD_DIR"
+        build_dir = os.getenv(var, None)
+        self.assertIsNotNone(build_dir,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/build/vapi_test/vapi_c_test" % built_root
-        worker = Worker(
-            [executable, "vapi client", self.shm_prefix], self.logger)
+        executable = f"{build_dir}/bin/vapi_c_test"
+        worker = Worker([executable, "vapi client",
+                         self.get_api_segment_prefix()], self.logger)
         worker.start()
         timeout = 60
         worker.join(timeout)
@@ -47,16 +47,15 @@ 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_DIR"
-        built_root = os.getenv(var, None)
-        self.assertIsNotNone(built_root,
+        var = "VPP_BUILD_DIR"
+        build_dir = os.getenv(var, None)
+        self.assertIsNotNone(build_dir,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/build/vapi_test/vapi_cpp_test" % built_root
-        worker = Worker(
-            [executable, "vapi client", self.shm_prefix], self.logger)
+        executable = f"{build_dir}/bin/vapi_cpp_test"
+        worker = Worker([executable, "vapi client",
+                         self.get_api_segment_prefix()], self.logger)
         worker.start()
         timeout = 120
         worker.join(timeout)