diff options
author | Steven Knight <knight@baldmt.com> | 2005-03-17 03:06:56 +0000 |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2005-03-17 03:06:56 +0000 |
commit | 7e4b4c01d69a2d2a776abb49db68507706ded50e (patch) | |
tree | 89d7e783bfa6814d01de40df8a8b9b18539d9ef4 /test/import.py | |
parent | a911d49dc68205cebbd6b7e728f2cd1ad49b9aca (diff) | |
download | scons-7e4b4c01d69a2d2a776abb49db68507706ded50e.tar.gz |
Windows portability in tests. Replace overlooked import
Diffstat (limited to 'test/import.py')
-rw-r--r-- | test/import.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/test/import.py b/test/import.py index 1aae7ce1..5bf2042e 100644 --- a/test/import.py +++ b/test/import.py @@ -140,13 +140,23 @@ scons: warning: Intel license dir was not found. Tried using the INTEL_LICENSE_ File "SConstruct", line 1, in ? """ +moc = test.where_is('moc') +if moc: + import os.path + qt_err = """ +scons: warning: Could not detect qt, using moc executable as a hint (QTDIR=%s) +File "SConstruct", line 1, in ? +""" % os.path.dirname(os.path.dirname(moc)) +else: + qt_err = """ +scons: warning: Could not detect qt, using empty QTDIR +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 ? -""", + 'qt' : qt_err, } # An SConstruct for importing Tool names that have illegal characters @@ -176,7 +186,7 @@ for tool in tools: if stderr != '' and stderr != error_output.get(tool, ''): print "Failed importing '%s', stderr:" % tool print stderr - failures.append[tool] + failures.append(tool) test.fail_test(len(failures)) |