diff options
| author | Steven Knight <knight@baldmt.com> | 2009-01-18 19:33:53 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-01-18 19:33:53 (GMT) |
| commit | 6d699199b32405f27c8e76b5164bdc57fcd69602 (patch) | |
| tree | 05c369c0cf64c9d7514b08db774ba6512cc587ca /test/VariantDir | |
| parent | 79a086c22c6964a04ab88a382aaba3626c216b5a (diff) | |
| download | SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.zip SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.tar.gz SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.tar.bz2 | |
Various Windows fixes:
* Restore correct code to detect a bad drive on Windows.
* Update the bad drive error message to include the target name.
* Update SConfTests.py to print the config.log on error.
* Fix the smart_link() error message to not use repr() of a path so
escaping the \ separators on Windows doesn't interfere with regex matchs.
* Update regexes in test/VariantDir/reflect.py to accomodate command-line
re-ordering to put the /OUT: first in the line.
* Explicitly check for smart_link() messages even on Windows.
Diffstat (limited to 'test/VariantDir')
| -rw-r--r-- | test/VariantDir/reflect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/VariantDir/reflect.py b/test/VariantDir/reflect.py index 8fcca56..d231fa9 100644 --- a/test/VariantDir/reflect.py +++ b/test/VariantDir/reflect.py @@ -90,7 +90,7 @@ INC_CNI = re.escape(os.path.join('INC_dir1', 'dir2', 'dir1', 'dir2_CNI')) # The .+ after mycc\\.py below handles /nologo flags from Visual C/C++. expect = test.wrap_stdout("""\ scons: building associated VariantDir targets: %(targets)s -"%(re_python)s" mycc\\.py.* %(INC_CNI)s .+ +"%(re_python)s" mycc\\.py.* %(INC_CNI)s.* Compile "%(re_python)s" mylink\\.py .+ Link @@ -120,7 +120,7 @@ INC_CNI = re.escape(os.path.join('INC_dir1', 'dir2_CNI')) test.run(arguments = '', stdout=test.wrap_stdout("""\ scons: building associated VariantDir targets: %(targets)s -"%(re_python)s" mycc\\.py.* %(INC_CNI)s .+ +"%(re_python)s" mycc\\.py.* %(INC_CNI)s.* Compile "%(re_python)s" mylink\\.py .+ Link |