add ifdef guard to .h file

remove UUID from TUI
STF Python API: show newlines instead of "\n\n\n" in Exception message
STF Python API: remove "During handling of the above exception, another exception occurred:" in Python3.3+
dpdk_nic_bind.py: ensure needed PATH exists for lspci etc.
t-rex-64: remove "stty: standard input: Inappropriate ioctl for device"
t-rex-64: remove "cat: write error: Broken pipe"

Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py
index 1f066fa9..cd19c790 100755
--- a/scripts/automation/regression/trex_unit_test.py
+++ b/scripts/automation/regression/trex_unit_test.py
@@ -180,20 +180,14 @@ class CTRexTestConfiguringPlugin(Plugin):
         CTRexScenario.test  = options.test
         if self.collect_only or self.functional:
             return
-        
         if CTRexScenario.setup_dir and options.config_path:
             raise Exception('Please either define --cfg or use env. variable SETUP_DIR, not both.')
-
-        if not CTRexScenario.setup_dir and not options.config_path:
-            raise Exception('Please specify path to config.yaml using --cfg parameter or env. variable SETUP_DIR')
-
-        if not options.config_path:
+        if not options.config_path and CTRexScenario.setup_dir:
             options.config_path = CTRexScenario.setup_dir
-        if not CTRexScenario.setup_dir:
-            CTRexScenario.setup_dir = options.config_path
-        
-        CTRexScenario.setup_name = os.path.basename(CTRexScenario.setup_dir)
-
+        if not options.config_path:
+            raise Exception('Please specify path to config.yaml using --cfg parameter or env. variable SETUP_DIR')
+        options.config_path = options.config_path.rstrip('/')
+        CTRexScenario.setup_name = os.path.basename(options.config_path)
         self.configuration = misc_methods.load_complete_config_file(os.path.join(options.config_path, 'config.yaml'))
         self.configuration.trex['trex_name'] = address_to_ip(self.configuration.trex['trex_name']) # translate hostname to ip
         self.benchmark     = misc_methods.load_benchmark_config_file(os.path.join(options.config_path, 'benchmark.yaml'))
@@ -327,6 +321,7 @@ if __name__ == "__main__":
     if not CTRexScenario.setup_dir:
         CTRexScenario.setup_dir = check_setup_path(os.path.join('setups', setup_dir))
 
+
     nose_argv = ['', '-s', '-v', '--exe', '--rednose', '--detailed-errors']
     test_client_package = False
     if '--test-client-package' in sys.argv: