diff options
| author | Steven Knight <knight@baldmt.com> | 2004-09-05 19:23:37 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-09-05 19:23:37 (GMT) |
| commit | a5cbcd54f99ae67deba35541a30212475b8338a0 (patch) | |
| tree | 513d3438b9e39a7e9384ba093cd95fe75f4dd883 /test/QTFLAGS.py | |
| parent | 1091ca56e75ed39820081d4cca289c241c7fbceb (diff) | |
| download | SCons-a5cbcd54f99ae67deba35541a30212475b8338a0.zip SCons-a5cbcd54f99ae67deba35541a30212475b8338a0.tar.gz SCons-a5cbcd54f99ae67deba35541a30212475b8338a0.tar.bz2 | |
Win32 portability for tests.
Diffstat (limited to 'test/QTFLAGS.py')
| -rw-r--r-- | test/QTFLAGS.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/QTFLAGS.py b/test/QTFLAGS.py index a07c2c6..f9cb917 100644 --- a/test/QTFLAGS.py +++ b/test/QTFLAGS.py @@ -244,14 +244,17 @@ env1 = Environment(tools=['qt'], QT_LIBPATH='$QTDIR/lib64', QT_CPPPATH='$QTDIR/h64') -if not env1.subst('$CPPPATH') == os.path.join(r'%(QTDIR)s', 'h64'): - print env1.subst('$CPPPATH') +cpppath = env1.subst('$CPPPATH') +if os.path.normpath(cpppath) != os.path.join(r'%(QTDIR)s', 'h64'): + print cpppath Exit(1) -if not env1.subst('$LIBPATH') == os.path.join(r'%(QTDIR)s', 'lib64'): - print env1.subst('$LIBPATH') +libpath = env1.subst('$LIBPATH') +if os.path.normpath(libpath) != os.path.join(r'%(QTDIR)s', 'lib64'): + print libpath Exit(2) -if not env1.subst('$QT_MOC') == os.path.join(r'%(QTDIR)s', 'bin64', 'moc'): - print env1.subst('$QT_MOC') +qt_moc = env1.subst('$QT_MOC') +if os.path.normpath(qt_moc) != os.path.join(r'%(QTDIR)s', 'bin64', 'moc'): + print qt_moc Exit(3) env2 = Environment(tools=['default', 'qt'], |