diff options
| author | Steven Knight <knight@baldmt.com> | 2005-10-10 04:22:54 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-10-10 04:22:54 (GMT) |
| commit | 5b7ceab9bc99f5474a80e4d8d3ee9d2f8ad42675 (patch) | |
| tree | 2f8e826219def1de31873c0a88a2e47052dd59b9 /test | |
| parent | fb3e4847942786fed2f7b10a1da35e1c0ef92513 (diff) | |
| download | SCons-5b7ceab9bc99f5474a80e4d8d3ee9d2f8ad42675.zip SCons-5b7ceab9bc99f5474a80e4d8d3ee9d2f8ad42675.tar.gz SCons-5b7ceab9bc99f5474a80e4d8d3ee9d2f8ad42675.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')
| -rw-r--r-- | test/import.py | 22 |
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, |