| Message ID | 20120528164004.0E8E02BECE@hpbd-ubiq34.eem.corp.google.com |
|---|---|
| State | New |
| Headers | show |
On 28 May 2012 18:40, Simon Baldwin <simonb@google.com> wrote: > > Port r184840 from gcc-4_6. > > Forward-port r184840, contrib/testsuite-management/validate_failures.py fix > for cross-compilers, from gcc-4_6 to gcc-4_7. > > Okay for google/integration and google/gcc-4_7-integration branches? That should have read "Okay for google/gcc-4_7?". Turns out it's already in the others. > > > 2012-05-28 Simon Baldwin <simonb@google.com> > > Port r184840 from gcc-4_6. > > 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. > > > Index: contrib/testsuite-management/validate_failures.py > =================================================================== > --- contrib/testsuite-management/validate_failures.py (revision 187932) > +++ contrib/testsuite-management/validate_failures.py (working copy) > @@ -146,7 +146,8 @@ def GetMakefileValue(makefile_name, valu > 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 > > > -- > This patch is available for review at http://codereview.appspot.com/6259049 -- Google UK Limited | Registered Office: Belgrave House, 76 Buckingham Palace Road, London SW1W 9TQ | Registered in England Number: 3977902
Index: contrib/testsuite-management/validate_failures.py =================================================================== --- contrib/testsuite-management/validate_failures.py (revision 187932) +++ contrib/testsuite-management/validate_failures.py (working copy) @@ -146,7 +146,8 @@ def GetMakefileValue(makefile_name, valu 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