aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorJing Yu <jingyu@google.com>2012-03-26 11:12:29 -0700
committerJing Yu <jingyu@google.com>2012-03-26 11:12:29 -0700
commit872d5db7c3471a9d7fa78a290f84eb13b13f587a (patch)
tree62598a1372c7d71d5211f2d40b6ecc8413351b10 /gcc-4.6
parentcf90705c8503b3a763801a4f31f6f2272015f0dc (diff)
downloadtoolchain_gcc-872d5db7c3471a9d7fa78a290f84eb13b13f587a.tar.gz
toolchain_gcc-872d5db7c3471a9d7fa78a290f84eb13b13f587a.tar.bz2
toolchain_gcc-872d5db7c3471a9d7fa78a290f84eb13b13f587a.zip
Backport r184357 from trunk
2012-02-17 Doug Kwan <dougkwan@google.com> * contrib/testsuite-management/validate_failures.py (GetMakefileValue): Check for cross compilers. Change-Id: Ibb7878370eaa61ce61a9517dc69dfe9c189cf580
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/ChangeLog.google-4_69
-rwxr-xr-xgcc-4.6/contrib/testsuite-management/validate_failures.py3
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc-4.6/ChangeLog.google-4_6 b/gcc-4.6/ChangeLog.google-4_6
index 5e5096c8a..9224c3ad8 100644
--- a/gcc-4.6/ChangeLog.google-4_6
+++ b/gcc-4.6/ChangeLog.google-4_6
@@ -1,3 +1,12 @@
+2012-03-02 Han Shen <shenhan@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.
+
2011-09-27 Sriraman Tallam <tmsriram@google.com>
* Makefile.in: Regenerate.
diff --git a/gcc-4.6/contrib/testsuite-management/validate_failures.py b/gcc-4.6/contrib/testsuite-management/validate_failures.py
index be2ffcee5..072de796a 100755
--- a/gcc-4.6/contrib/testsuite-management/validate_failures.py
+++ b/gcc-4.6/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