diff options
| author | Steven Knight <knight@baldmt.com> | 2004-11-21 00:41:12 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-11-21 00:41:12 (GMT) |
| commit | ffc625f8cf332399ba754bf2ebe9e700e5122eac (patch) | |
| tree | 9c21395a4d49fd3aba7a22fe8e93b041445b00b3 /test/import.py | |
| parent | 376cfbfee0d52e867f2c6b955b6e218d788284ba (diff) | |
| download | SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.zip SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.tar.gz SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.tar.bz2 | |
Miscellaneous fixes: portability and version fixes, missing , better CXXCOM tests, ATL include directories, intelc Tool import.
Diffstat (limited to 'test/import.py')
| -rw-r--r-- | test/import.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/import.py b/test/import.py index cfe72e6..a8a86bf 100644 --- a/test/import.py +++ b/test/import.py @@ -134,11 +134,14 @@ tools = [ 'zip', ] -error_output = { - 'icl' : """ +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. File "SConstruct", line 1, in ? -""", +""" + +error_output = { + 'icl' : intel_license_warning, + 'intelc' : intel_license_warning, 'qt' : """ scons: warning: Could not detect qt, using empty QTDIR File "SConstruct", line 1, in ? |