Patchwork [google/4.6] Backport r184357 from trunk to fix validate_failures.py (issue5720047)

login
register
mail settings
Submitter Doug Kwan (關振德)
Date March 2, 2012, 2:57 a.m.
Message ID <20120302025731.3C2CD20736@atree.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/144127/
State New
Headers show

Comments

Doug Kwan (關振德) - March 2, 2012, 2:57 a.m.
Hi Diego,

    This is a backport from trunk to fix a problem in validate_failures.py
when testing a cross compiler.

-Doug

2012-03-01   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.


--
This patch is available for review at http://codereview.appspot.com/5720047
Doug Kwan (關振德) - March 2, 2012, 3 a.m.
If approved, this will be applied after Diego's 4.6.3 release merge
into Google's gcc-4_6 branch.

-Doug

On Thu, Mar 1, 2012 at 6:57 PM, Doug Kwan <dougkwan@google.com> wrote:
> Hi Diego,
>
>    This is a backport from trunk to fix a problem in validate_failures.py
> when testing a cross compiler.
>
> -Doug
>
> 2012-03-01   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 184772)
> +++ contrib/testsuite-management/validate_failures.py   (working copy)
> @@ -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
>
>
> --
> This patch is available for review at http://codereview.appspot.com/5720047
Diego Novillo - March 2, 2012, 1:31 p.m.
On 01/03/12 21:57 , Doug Kwan wrote:
> Hi Diego,
>
>      This is a backport from trunk to fix a problem in validate_failures.py
> when testing a cross compiler.
>
> -Doug
>
> 2012-03-01   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.

OK, thanks.

I'll ping you once the merge is committed.


Diego.

Patch

Index: contrib/testsuite-management/validate_failures.py
===================================================================
--- contrib/testsuite-management/validate_failures.py	(revision 184772)
+++ contrib/testsuite-management/validate_failures.py	(working copy)
@@ -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