From patchwork Fri Dec 14 18:10:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 206534 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 DB15F2C0090 for ; Sat, 15 Dec 2012 05:10:44 +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=1356113445; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:Date:To:Subject:User-Agent:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-ID:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=PDDEwryUeTNHiCt0/rKwSemTt0s=; b=k8FcvVZ0Wu9ck/3xfCzfTq0DEqY8mHcrCWB0VDhFGHGHHxZn5zAiXeimDrOV4b FlfOz5T+daYOqwbCyXG7vLevl5MGpun2j2g5odwjVkR6daIWGGMzkDtNobv+uS/5 0Gho9RCsncvMFfA9ztl/H1kwrHIY/bGSvNxHNW7QwvNss= 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-M-MSG:Received:Received:Received:From:Date:To:Subject:User-Agent:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID:X-EMS-Proccessed:X-EMS-STAMP:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=YSq8LsuoYiTvkOwf9yJAApPFslyBh2Lq2di0UjMmEsr4PIqSdPDTNXPcHNcgab B7mBDdFGf1a5BkYBDBRSaXMu0r5P7ZTIN253Kr3i+/S4Kpa6tz+URsb9u1BMCjLX bTsWfFVcr90NltlP4A9WJI/hJO8HJ1sleiUu8WSwuXIL0=; Received: (qmail 30549 invoked by alias); 14 Dec 2012 18:10:27 -0000 Received: (qmail 30523 invoked by uid 22791); 14 Dec 2012 18:10:26 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from dns1.mips.com (HELO dns1.mips.com) (12.201.5.69) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Dec 2012 18:10:21 +0000 Received: from mailgate1.mips.com (mailgate1.mips.com [12.201.5.111]) by dns1.mips.com (8.13.8/8.13.8) with ESMTP id qBEIAJal029303; Fri, 14 Dec 2012 10:10:20 -0800 X-M-MSG: Received: from exchdb01.mips.com (unknown [192.168.36.84]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mailgate1.mips.com (Postfix) with ESMTP id 295BE364669; Fri, 14 Dec 2012 10:10:16 -0800 (PST) Received: from ubuntu-sellcey.mips.com (192.168.65.53) by exchhub01.mips.com (192.168.36.84) with Microsoft SMTP Server id 14.1.270.1; Fri, 14 Dec 2012 10:10:12 -0800 Received: by ubuntu-sellcey.mips.com (sSMTP sendmail emulation); Fri, 14 Dec 2012 10:10:13 -0800 From: "Steve Ellcey " Date: Fri, 14 Dec 2012 10:10:13 -0800 To: , Subject: [patch, libstdc++ testsuite] Shrink more tests for simulator User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Message-ID: <2591f3c8-28db-4656-a635-af9c65fc5e91@EXCHHUB01.MIPS.com> X-EMS-Proccessed: 6LP3oGfGVdcdb8o1aBnt6w== X-EMS-STAMP: M6RZPtnmrl+b/VU58CfwyA== 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 Here are four more C++ tests that fail for me when run under the GNU simulator. I would like to shrink them to use less memory in the same way as the other tests that I modified earlier. OK to checkin? Steve Ellcey sellcey@mips.com 2012-12-14 Steve Ellcey * testsuite/21_strings/basic_string/append/wchar_t/3.cc: Shrink memory usage under simulator. * testsuite/21_strings/basic_string/cons/wchar_t/6.cc: Ditto. * testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc: Ditto. * testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc: Ditto. diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc index dca5dbd..d20b994 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc @@ -19,6 +19,12 @@ // 21.3.5 string modifiers +// { dg-options "-DITERATIONS=14" { target simulator } } + +#ifndef ITERATIONS +#define ITERATIONS 18 +#endif + #include #include @@ -37,7 +43,7 @@ test03() { wstring one(source); wstring two(source); - for (unsigned j = 0; j < 18; ++j) + for (unsigned j = 0; j < ITERATIONS; ++j) { VERIFY( one == two ); one.append(one); diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc index 82ed764..95acdd0 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc @@ -19,6 +19,12 @@ // 21.3.1 basic_string constructors. +// { dg-options "-DITERATIONS=11" { target simulator } } + +#ifndef ITERATIONS +#define ITERATIONS 13 +#endif + #include #include #include @@ -50,6 +56,6 @@ void test01(int iter) int main() { - test01(13); + test01(ITERATIONS); return 0; } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc index 0883e13..a647c39 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc @@ -17,6 +17,12 @@ // 21.3.7.9 inserters and extractors +// { dg-options "-DMAX_SIZE=505" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 777 +#endif + #include #include #include @@ -64,7 +70,7 @@ void test01() const wchar_t delim = L'|'; const unsigned nchunks = 10; - const wstring data = prepare(777, nchunks, delim); + const wstring data = prepare(MAX_SIZE, nchunks, delim); wofstream ofstrm; ofstrm.open(filename); diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc index 2f174ca..a0a822f 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc @@ -17,6 +17,12 @@ // 21.3.7.9 inserters and extractors +// { dg-options "-DMAX_SIZE=466" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 666 +#endif + #include #include #include @@ -63,7 +69,7 @@ void test01() const char filename[] = "inserters_extractors-3.txt"; const unsigned nchunks = 10; - const wstring data = prepare(666, nchunks); + const wstring data = prepare(MAX_SIZE, nchunks); wofstream ofstrm; ofstrm.open(filename);