From patchwork Thu Nov 29 20:46:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 202821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id D6B9E2C008F for ; Fri, 30 Nov 2012 07:46:54 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1354826815; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-ID:Date:To:Cc:Subject: In-Reply-To:References:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=2aes/H6rFUXlVAgAnoujemSuLR4=; b=N0a0TRDbKEHN0DC FTdX9YsyX3S2tEAmYNppTIW8Fny8Y5GY5trLZf3I/GtY9TYQtkbw04EXfLLWzQ23 8PAqbnT8U0pejD9sk2xeauiBdHrh79x5C/4VWQIQDgGdAOVt/Hnk5HE5qIjJBg0I 98lWpB5t7kyjHErMM4sqK9LtK4cs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:Received:From:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID:Date:To:Cc:Subject:In-Reply-To:References:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=b0hUQb8HkkrO5mPeL4WZ7TUsGzc5g/eDgN+H7Rm+9ECA3Xi1+U8VwI9tXCobOP NErDTkM1dSbyRmVeHe6tx48EU3C27mZIOjPPOzOQ8c/1Zxp1ptEpQjCp4qSW4/R5 SrlvmMfGusZJ6HSZjdL4bMYVvSpWs+UqoRLrXQZEmIGjQ=; Received: (qmail 11565 invoked by alias); 29 Nov 2012 20:46:35 -0000 Received: (qmail 11533 invoked by uid 22791); 29 Nov 2012 20:46:31 -0000 X-SWARE-Spam-Status: No, hits=-5.4 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-wg0-f73.google.com (HELO mail-wg0-f73.google.com) (74.125.82.73) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 29 Nov 2012 20:46:23 +0000 Received: by mail-wg0-f73.google.com with SMTP id dt12so815379wgb.2 for ; Thu, 29 Nov 2012 12:46:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:mime-version:content-type:content-transfer-encoding:message-id :date:to:cc:subject:in-reply-to:references:x-mailer :x-gm-message-state; bh=ffUlEBRymTwQjtgnX7ugCq6zxGA6d3KP1whq2wy1dcQ=; b=U0JVjqoWb5FN9pykEsqyxmiA7MrSKSyHiD7Zn3vQWb9Jo9u9GPjsvLkaGOKkbcdyVP 7lhJ0XPwLUtPTWtfSzYx6O5LsxqJE3Vgd0l8McClybCFsykt9rP7me8IgG1fKd3qf6JM IVl9OMTKd1oyg2Bo+VIMGhCO7fklF/1Dczl6t2O+YkWdEsrweb+dEEaZAGy3v5kw2xH7 e72k7lgjYIXCFTzLTzS6qvy3ZSUYcAHrXaUdYgImlOwHuRhzzQ20J6BLE9fOTve1Yxzc 7PQFFo0nfG7b5V1fghHv/k62gyUOsMuJ4yGqcWq82+veHVDGlfcSa+lduPCdISWvLPVI z1FQ== Received: by 10.14.2.199 with SMTP id 47mr28674938eef.5.1354221981996; Thu, 29 Nov 2012 12:46:21 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id u8si674396een.1.2012.11.29.12.46.21 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 29 Nov 2012 12:46:21 -0800 (PST) Received: from ruffy2.mtv.corp.google.com (ruffy2.mtv.corp.google.com [172.17.128.107]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id BC09420004E; Thu, 29 Nov 2012 12:46:20 -0800 (PST) From: Doug Evans MIME-Version: 1.0 Message-ID: <20663.51611.466694.808097@ruffy2.mtv.corp.google.com> Date: Thu, 29 Nov 2012 12:46:19 -0800 To: Diego Novillo Cc: gcc-patches@gcc.gnu.org Subject: Re: [RFA 4/8] validate_failures.py: rename --manifest to --manifest_path In-Reply-To: References: X-Gm-Message-State: ALoCoQl4PhfNsSi5KlMbVZvHhz+DibXJNTbDztV1QiQB5yZvBg9WY/DyUsU5fmT2WkTZTnAv7nXAD1Qbyxd4670NCjuXbiKlnjVOA0xIOnEFVWhACuk+rI/A5N+X4HW/wKwE6yTn1m1o/O2IL0w87dNYQQUzulMo7p4n7t3F5jZqWcnOREdWLyzZBacWaLI54Ne55tN4NC8y/RtIVJwUsoiwDCorTeMuvQ== X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Diego Novillo writes: > On Sat, Nov 24, 2012 at 5:50 PM, Doug Evans wrote: > > Hi. > > This fourth patch renames option --manifest to --manifest_path. > > I have a later patch that adds a --manifest_name option, making "--manifest" > > too confusing/ambiguous. > > > > Ok to check in? > > [I still have to update invocations that use --manifest, > > but that's a separate patch.] > > > > 2012-11-24 Doug Evans > > > > * testsuite-management/validate_failures.py: Rename option --manifest to > > --manifest_path. Rename local variables manifest_name to manifest_path. > > > OK. I ran into some issues, so I'm going to do this in baby steps. This patch just renames the variables (for clarity's sake, at least for me :-)). Ok to check in? 2012-11-29 Doug Evans * testsuite-management/validate_failures.py: Rename variable manifest_name to manifest_path everywhere. Index: validate_failures.py =================================================================== --- validate_failures.py (revision 193952) +++ validate_failures.py (working copy) @@ -220,7 +220,7 @@ return result_set -def GetManifest(manifest_name): +def GetManifest(manifest_path): """Build a set of expected failures from the manifest file. Each entry in the manifest file should have the format understood @@ -228,8 +228,8 @@ If no manifest file exists for this target, it returns an empty set. """ - if os.path.exists(manifest_name): - return ParseSummary(manifest_name) + if os.path.exists(manifest_path): + return ParseManifest(manifest_path) else: return set() @@ -334,14 +334,14 @@ (srcdir, target, valid_build) = GetBuildData(options) if not valid_build: return False - manifest_name = _MANIFEST_PATH_PATTERN % (srcdir, target) + manifest_path = _MANIFEST_PATH_PATTERN % (srcdir, target) else: - manifest_name = options.manifest - if not os.path.exists(manifest_name): - Error('Manifest file %s does not exist.' % manifest_name) + manifest_path = options.manifest + if not os.path.exists(manifest_path): + Error('Manifest file %s does not exist.' % manifest_path) - print 'Manifest: %s' % manifest_name - manifest = GetManifest(manifest_name) + print 'Manifest: %s' % manifest_path + manifest = GetManifest(manifest_path) sum_files = GetSumFiles(options.results, options.build_dir) actual = GetResults(sum_files) @@ -357,14 +357,14 @@ if not valid_build: return False - manifest_name = _MANIFEST_PATH_PATTERN % (srcdir, target) - if os.path.exists(manifest_name) and not options.force: + manifest_path = _MANIFEST_PATH_PATTERN % (srcdir, target) + if os.path.exists(manifest_path) and not options.force: Error('Manifest file %s already exists.\nUse --force to overwrite.' % - manifest_name) + manifest_path) sum_files = GetSumFiles(options.results, options.build_dir) actual = GetResults(sum_files) - manifest_file = open(manifest_name, 'w') + manifest_file = open(manifest_path, 'w') for result in sorted(actual): print result manifest_file.write('%s\n' % result)