Diff: test_api.py

Revision:

20:835f6355470d

Parent:

13:ab47a20b66f0

Child:

22:9e85236d8716

--- a/test_api.py	Fri Jul 15 13:11:30 2016 +0100
+++ b/test_api.py	Fri Jul 15 15:28:09 2016 +0100
@@ -57,7 +57,7 @@
 from tools.build_api import add_result_to_report
 from tools.build_api import scan_for_source_paths
 from tools.libraries import LIBRARIES, LIBRARY_MAP
-from tools.toolchains import TOOLCHAIN_BIN_PATH
+from tools.toolchains import TOOLCHAIN_PATHS
 from tools.test_exporters import ReportExporter, ResultExporterType
 
 import tools.host_tests.host_tests_plugins as host_tests_plugins
@@ -1335,8 +1335,8 @@
                 if conflict:
                     cell_val += '*'
                 # Check for conflicts: toolchain vs toolchain path
-                if toolchain in TOOLCHAIN_BIN_PATH:
-                    toolchain_path = TOOLCHAIN_BIN_PATH[toolchain]
+                if toolchain in TOOLCHAIN_PATHS:
+                    toolchain_path = TOOLCHAIN_PATHS[toolchain]
                     if not os.path.isdir(toolchain_path):
                         conflict_path = True
                         if toolchain not in toolchain_path_conflicts:
@@ -1360,8 +1360,8 @@
 
         for toolchain in toolchain_path_conflicts:
         # Let's check toolchain configuration
-            if toolchain in TOOLCHAIN_BIN_PATH:
-                toolchain_path = TOOLCHAIN_BIN_PATH[toolchain]
+            if toolchain in TOOLCHAIN_PATHS:
+                toolchain_path = TOOLCHAIN_PATHS[toolchain]
                 if not os.path.isdir(toolchain_path):
                     result += "\t# Toolchain %s path not found: %s\n"% (toolchain, toolchain_path)
     return result