X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vapi.py;h=ebd189cd7c890a1d8b3610975e70f71db24ce8a8;hb=7c03ed4;hp=50a34df01fe525e4763b37a43d28af580ca47363;hpb=cae7134a8c23b2ae3bb742b12789e5572aabf73d;p=vpp.git

diff --git a/test/test_vapi.py b/test/test_vapi.py
index 50a34df01fe..ebd189cd7c8 100644
--- a/test/test_vapi.py
+++ b/test/test_vapi.py
@@ -8,17 +8,17 @@ from framework import VppTestCase, running_extended_tests, \
     running_on_centos, VppTestRunner, Worker
 
 
-@unittest.skipUnless(running_extended_tests(), "part of extended tests")
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
 class VAPITestCase(VppTestCase):
     """ VAPI test """
 
     def test_vapi_c(self):
         """ run C VAPI tests """
-        var = "BR"
+        var = "TEST_DIR"
         built_root = os.getenv(var, None)
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vapi_test/vapi_c_test" % built_root
+        executable = "%s/build/vapi_test/vapi_c_test" % built_root
         worker = Worker(
             [executable, "vapi client", self.shm_prefix], self.logger)
         worker.start()
@@ -41,14 +41,14 @@ 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++")
+    @unittest.skipIf(running_on_centos, "Centos's gcc can't compile our C++")
     def test_vapi_cpp(self):
         """ run C++ VAPI tests """
-        var = "BR"
+        var = "TEST_DIR"
         built_root = os.getenv(var, None)
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vapi_test/vapi_cpp_test" % built_root
+        executable = "%s/build/vapi_test/vapi_cpp_test" % built_root
         worker = Worker(
             [executable, "vapi client", self.shm_prefix], self.logger)
         worker.start()