aboutsummaryrefslogtreecommitdiffstats
path: root/test/framework.py
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2018-11-08 11:21:39 +0100
committerDamjan Marion <dmarion@me.com>2018-11-29 08:22:10 +0000
commitb8c72a4a8d8bd330ab62dc0c9461cac2b137575b (patch)
treeb2470923ad4e3612282115ef11ec77e1e1b70f3c /test/framework.py
parent040950a59d53e8802ad31430d67df105939cce4c (diff)
make test: create virtualenv under /test/
instead of using build-root, use /test/venv directory for virtualenv similarly, don't pollute build-root with test-built binaries Change-Id: I1e63c04037eaee718b27b34ef16c9eb0252afa53 Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'test/framework.py')
-rw-r--r--test/framework.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/framework.py b/test/framework.py
index 54b7a2dfa5e..2bbb4ce44f7 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -265,8 +265,8 @@ class VppTestCase(unittest.TestCase):
c = os.getenv("CACHE_OUTPUT", "1")
cls.cache_vpp_output = False if c.lower() in ("n", "no", "0") else True
cls.set_debug_flags(d)
- cls.vpp_bin = os.getenv('VPP_TEST_BIN', "vpp")
- cls.plugin_path = os.getenv('VPP_TEST_PLUGIN_PATH')
+ cls.vpp_bin = os.getenv('VPP_BIN', "vpp")
+ cls.plugin_path = os.getenv('VPP_PLUGIN_PATH')
cls.extern_plugin_path = os.getenv('EXTERN_PLUGINS')
plugin_path = None
if cls.plugin_path is not None:
@@ -1073,7 +1073,7 @@ class VppTestResult(unittest.TestResult):
def symlink_failed(self):
if self.current_test_case_info:
try:
- failed_dir = os.getenv('VPP_TEST_FAILED_DIR')
+ failed_dir = os.getenv('FAILED_DIR')
link_path = os.path.join(
failed_dir,
'%s-FAILED' %