bash: fix vpp-make-test -g option

[vpp.git] / test / test_vapi.py

diff --git a/test/test_vapi.py b/test/test_vapi.py
index 1a4293d..d910992 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):
@@ -25,8 +25,8 @@ class VAPITestCase(VppTestCase):
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
         executable = "%s/vapi_test/vapi_c_test" % built_root
-        worker = Worker(
-            [executable, "vapi client", self.shm_prefix], self.logger)
+        worker = Worker([executable, "vapi client",
+                         self.get_api_segment_prefix()], self.logger)
         worker.start()
         timeout = 60
         worker.join(timeout)
@@ -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"
@@ -55,8 +54,8 @@ class VAPITestCase(VppTestCase):
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
         executable = "%s/vapi_test/vapi_cpp_test" % built_root
-        worker = Worker(
-            [executable, "vapi client", self.shm_prefix], self.logger)
+        worker = Worker([executable, "vapi client",
+                         self.get_api_segment_prefix()], self.logger)
         worker.start()
         timeout = 120
         worker.join(timeout)