diff options
| author | Steven Knight <knight@baldmt.com> | 2004-07-15 12:39:34 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-07-15 12:39:34 (GMT) |
| commit | 502bdb0f465217b1b34bfd53cbf32385e40bdce5 (patch) | |
| tree | c2864cbd6341ba776c90abb8c2cbb1456906a0a5 /etc/TestSCons.py | |
| parent | 9378d5faa513dad65da961b279c92722d593be28 (diff) | |
| download | SCons-502bdb0f465217b1b34bfd53cbf32385e40bdce5.zip SCons-502bdb0f465217b1b34bfd53cbf32385e40bdce5.tar.gz SCons-502bdb0f465217b1b34bfd53cbf32385e40bdce5.tar.bz2 | |
Win32 portability: add an explicit match argument to TestCommon.py, use it to only use match_re_dotall when we're using TestSCons.noisy_ar.
Diffstat (limited to 'etc/TestSCons.py')
| -rw-r--r-- | etc/TestSCons.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/TestSCons.py b/etc/TestSCons.py index 737f8a2..202f5d5 100644 --- a/etc/TestSCons.py +++ b/etc/TestSCons.py @@ -188,6 +188,7 @@ class TestSCons(TestCommon): arguments = options + " " + arguments kw['arguments'] = arguments kw['stdout'] = self.wrap_stdout(read_str = read_str, build_str = s) + kw['match'] = self.match_exact apply(self.run, [], kw) def not_up_to_date(self, options = None, arguments = None, **kw): @@ -204,10 +205,8 @@ class TestSCons(TestCommon): kw['stdout'] = self.wrap_stdout(build_str="("+s+"[^\n]*\n)*") kw['stdout'] = string.replace(kw['stdout'],'\n','\\n') kw['stdout'] = string.replace(kw['stdout'],'.','\\.') - old_match_func = self.match_func - self.match_func = match_re_dotall + kw['match'] = self.match_re_dotall apply(self.run, [], kw) - self.match_func = old_match_func # In some environments, $AR will generate a warning message to stderr # if the library doesn't previously exist and is being created. One |