diff options
| author |   Hanoh Haim <hhaim@cisco.com> | 2016-01-07 23:58:22 +0200 |
|---|---|---|
| committer | Hanoh Haim <hhaim@cisco.com> | 2016-01-07 23:58:22 +0200 |
| commit | 8db09096b9dcf030b7dc744fbd7ee463d8e6fd1b (patch) | |
| tree | 8de1422ac003e403889b2b248009431aa1176dd3 /scripts/automation/regression/trex_unit_test.py | |
| parent | 7e37a0aabbd351aa899bf7bdb2327eaa61733095 (diff) | |
| parent | 79b2a5ea59c3b420988891b9f3751579bfbe8e0e (diff) | |
Merge
Diffstat (limited to 'scripts/automation/regression/trex_unit_test.py')
| -rwxr-xr-x | scripts/automation/regression/trex_unit_test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py index 9e3652b4..f38eb04e 100755 --- a/scripts/automation/regression/trex_unit_test.py +++ b/scripts/automation/regression/trex_unit_test.py @@ -199,10 +199,10 @@ if __name__ == "__main__": long_test = False xml_name = 'unit_test.xml' CTRexScenario.report_dir = 'reports' - setup_dir = os.getenv('SETUP_DIR', '')#.rstrip('/') + setup_dir = os.getenv('SETUP_DIR', '').rstrip('/') CTRexScenario.setup_dir = check_setup_path(setup_dir) if not CTRexScenario.setup_dir: - CTRexScenario.setup_dir = check_setup_path(os.path.join(os.pardir, os.pardir, os.pardir, os.pardir, 'trex-local', 'setups', setup_dir)) + CTRexScenario.setup_dir = check_setup_path(os.path.join('setups', setup_dir)) if CTRexScenario.setup_dir: CTRexScenario.setup_name = os.path.basename(CTRexScenario.setup_dir) |