summaryrefslogtreecommitdiffstats
path: root/test/import.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-10-10 04:22:54 (GMT)
committerSteven Knight <knight@baldmt.com>2005-10-10 04:22:54 (GMT)
commit49cf589d13237f9ccdc0ae384bf40d3776065bb7 (patch)
tree2f8e826219def1de31873c0a88a2e47052dd59b9 /test/import.py
parent69998af3b908a9cfe2645daddf577ac01bcec285 (diff)
downloadSCons-49cf589d13237f9ccdc0ae384bf40d3776065bb7.zip
SCons-49cf589d13237f9ccdc0ae384bf40d3776065bb7.tar.gz
SCons-49cf589d13237f9ccdc0ae384bf40d3776065bb7.tar.bz2
Improve intelc.py so it doesn't throw an exception if a version other than ia32 (for example, em64t) is installed without the ia32 version. (Anonymous)
Diffstat (limited to 'test/import.py')
-rw-r--r--test/import.py22
1 files changed, 16 insertions, 6 deletions
diff --git a/test/import.py b/test/import.py
index 0c790ba..7bcc058 100644
--- a/test/import.py
+++ b/test/import.py
@@ -135,18 +135,24 @@ tools = [
'zip',
]
-# Intel no top dir warning, 32 bit version.
-intel_no_top_dir_32_warning = """
-scons: warning: Can't find Intel compiler top dir for version='None', abi='ia32'
+# Intel no compiler warning..
+intel_no_compiler_fmt = """
+scons: warning: Failed to find Intel compiler for version='None', abi='%s'
File "SConstruct", line 1, in ?
"""
-# Intel no top dir warning, 64 bit version.
-intel_no_top_dir_64_warning = """
-scons: warning: Can't find Intel compiler top dir for version='None', abi='x86_64'
+intel_no_compiler_32_warning = intel_no_compiler_fmt % 'ia32'
+intel_no_compiler_64_warning = intel_no_compiler_fmt % 'x86_64'
+
+# Intel no top dir warning.
+intel_no_top_dir_fmt = """
+scons: warning: Can't find Intel compiler top dir for version='None', abi='%s'
File "SConstruct", line 1, in ?
"""
+intel_no_top_dir_32_warning = intel_no_top_dir_fmt % 'ia32'
+intel_no_top_dir_64_warning = intel_no_top_dir_fmt % 'x86_64'
+
# Intel no license directory warning
intel_license_warning = """
scons: warning: Intel license dir was not found. Tried using the INTEL_LICENSE_FILE environment variable (), the registry () and the default path (C:\Program Files\Common Files\Intel\Licenses). Using the default path as a last resort.
@@ -155,6 +161,10 @@ File "SConstruct", line 1, in ?
intel_warnings = [
intel_license_warning,
+ intel_no_compiler_32_warning,
+ intel_no_compiler_32_warning + intel_license_warning,
+ intel_no_compiler_64_warning,
+ intel_no_compiler_64_warning + intel_license_warning,
intel_no_top_dir_32_warning,
intel_no_top_dir_32_warning + intel_license_warning,
intel_no_top_dir_64_warning,