When I tried contrib/testsuite-management/validate_failures.py for the
first time this weekend, I ran into the following problem: while it
works fine for a i386-pc-solaris2.11 bootstrap, it fails instead for a
amd64-pc-solaris2.11 bootstrap:

      error: 11-gcc-64/build is not a valid GCC top level build directory.

The problem is that while the toplevel Makefile has

target=x86_64-pc-solaris2.11

the build was configured with --target=amd64-pc-solaris2.11 and the
target libraries live below the amd64-pc-solaris2.11, using the target
alias instead of the canonical target name.  Therefore the script thould
use

target_alias=amd64-pc-solaris2.11

to work in such a case.

The following patch does just that.

Ok for mainline?

Btw., it occured to me that it might be useful to add an option to
locate out-of-tree manifests.  I often have several source trees
(unmodified sources, ones with local patches) and would like to share
manifests between them.  While this can be achieved with symlinks, a
--manifest_dir or similar option might be an alternative.  Thoughts?

        Rainer


2012-04-15  Rainer Orth  <r...@cebitec.uni-bielefeld.de>

        * testsuite-management/validate_failures.py (GetBuildData): Use
        target_alias.

# HG changeset patch
# Parent 84699f134dedb823eb7ecde316543a2870d1b47a
Use target_alias in validate_failures.py

diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py
--- a/contrib/testsuite-management/validate_failures.py
+++ b/contrib/testsuite-management/validate_failures.py
@@ -5,7 +5,7 @@
 
 # Contributed by Diego Novillo <dnovi...@google.com>
 #
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 #
 # This file is part of GCC.
 #
@@ -241,7 +241,7 @@ def CompareResults(manifest, actual):
 
 
 def GetBuildData(options):
-  target = GetMakefileValue('%s/Makefile' % options.build_dir, 'target=')
+  target = GetMakefileValue('%s/Makefile' % options.build_dir, 'target_alias=')
   srcdir = GetMakefileValue('%s/Makefile' % options.build_dir, 'srcdir =')
   if not ValidBuildDirectory(options.build_dir, target):
     Error('%s is not a valid GCC top level build directory.' %
-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

Reply via email to