summaryrefslogtreecommitdiffstats
path: root/test/Win32/bad-drive.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2009-01-18 19:33:53 (GMT)
committerSteven Knight <knight@baldmt.com>2009-01-18 19:33:53 (GMT)
commit6d699199b32405f27c8e76b5164bdc57fcd69602 (patch)
tree05c369c0cf64c9d7514b08db774ba6512cc587ca /test/Win32/bad-drive.py
parent79a086c22c6964a04ab88a382aaba3626c216b5a (diff)
downloadSCons-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/Win32/bad-drive.py')
-rw-r--r--test/Win32/bad-drive.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/test/Win32/bad-drive.py b/test/Win32/bad-drive.py
index f07da2b..4961386 100644
--- a/test/Win32/bad-drive.py
+++ b/test/Win32/bad-drive.py
@@ -96,16 +96,13 @@ test.run(arguments = bad_drive + 'not_mentioned',
stderr = "scons: *** Do not know how to make target `%snot_mentioned'. Stop.\n" % (bad_drive),
status = 2)
-test.run(arguments = bad_drive + 'no_target_1',
- stderr = "scons: *** No drive `%s' for target `%sno_target_1'. Stop.\n" % (bad_drive, bad_drive),
- status = 2)
+expect = "scons: *** [%sno_target_1] No drive `%s' for target `%sno_target_1'.\n" % (bad_drive, bad_drive, bad_drive)
+test.run(arguments=bad_drive + 'no_target_1', stderr=expect, status=2)
-test.run(arguments = bad_drive + 'no_target_2',
- stderr = "scons: *** Source `ccc.does_not_exist' not found, needed by target `%sno_target_2'. Stop.\n" % bad_drive,
- status = 2)
+expect = "scons: *** [%sno_target_2] Source `ccc.does_not_exist' not found, needed by target `%sno_target_2'.\n" % (bad_drive, bad_drive)
+test.run(arguments=bad_drive + 'no_target_2', stderr=expect, status=2)
-test.run(arguments = 'ddd.out',
- stderr = "scons: *** Source `%sno_source' not found, needed by target `ddd.out'. Stop.\n" % bad_drive,
- status = 2)
+expect = "scons: *** [ddd.out] Source `%sno_source' not found, needed by target `ddd.out'.\n" % bad_drive
+test.run(arguments='ddd.out', stderr=expect, status=2)
test.pass_test()