diff options
author | Doug Kwan <dougkwan@google.com> | 2012-03-02 22:49:47 +0000 |
---|---|---|
committer | Doug Kwan <dougkwan@google.com> | 2012-03-02 22:49:47 +0000 |
commit | a9d7ec67630f6d827ab0980a70c18af2d55f5670 (patch) | |
tree | d1de6eecfdd7f8d63c7ed1979e69a463148eb50d | |
parent | e8523d1e2e6e797f39c3244d56d2410359ed911a (diff) |
2012-03-02 Doug Kwan <dougkwan@google.com>
Backport r184357 from trunk
2012-02-17 Doug Kwan <dougkwan@google.com>
* contrib/testsuite-management/validate_failures.py
(GetMakefileValue): Check for cross compilers.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_6@184840 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | ChangeLog.google-4_6 | 9 | ||||
-rwxr-xr-x | contrib/testsuite-management/validate_failures.py | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog.google-4_6 b/ChangeLog.google-4_6 index d87f899df27..631f1c6e0e4 100644 --- a/ChangeLog.google-4_6 +++ b/ChangeLog.google-4_6 @@ -1,5 +1,14 @@ 2012-03-02 Doug Kwan <dougkwan@google.com> + Backport r184357 from trunk + + 2012-02-17 Doug Kwan <dougkwan@google.com> + + * contrib/testsuite-management/validate_failures.py + (GetMakefileValue): Check for cross compilers. + +2012-03-02 Doug Kwan <dougkwan@google.com> + Backport r184370 from integration branch. 2012-02-17 Doug Kwan <dougkwan@google.com> diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py index be2ffcee5c6..072de796aa0 100755 --- a/contrib/testsuite-management/validate_failures.py +++ b/contrib/testsuite-management/validate_failures.py @@ -146,7 +146,8 @@ def GetMakefileValue(makefile_name, value_name): def ValidBuildDirectory(builddir, target): if (not os.path.exists(builddir) or not os.path.exists('%s/Makefile' % builddir) or - not os.path.exists('%s/build-%s' % (builddir, target))): + (not os.path.exists('%s/build-%s' % (builddir, target)) and + not os.path.exists('%s/%s' % (builddir, target)))): return False return True |