From stdcxx-commits-return-1762-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Tue Sep 18 17:57:33 2007 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 29616 invoked from network); 18 Sep 2007 17:57:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Sep 2007 17:57:33 -0000 Received: (qmail 85976 invoked by uid 500); 18 Sep 2007 17:57:25 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 85959 invoked by uid 500); 18 Sep 2007 17:57:25 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 85946 invoked by uid 99); 18 Sep 2007 17:57:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2007 10:57:25 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2007 17:57:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 53BD31A9838; Tue, 18 Sep 2007 10:57:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r577001 - /incubator/stdcxx/trunk/tests/regress/22.locale.stdcxx-554.cpp Date: Tue, 18 Sep 2007 17:57:12 -0000 To: stdcxx-commits@incubator.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070918175712.53BD31A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Tue Sep 18 10:57:11 2007 New Revision: 577001 URL: http://svn.apache.org/viewvc?rev=577001&view=rev Log: 2007-09-18 Farid Zaripov * 22.locale.stdcxx-554.cpp: Removed dependency on rwtest library. Modified: incubator/stdcxx/trunk/tests/regress/22.locale.stdcxx-554.cpp Modified: incubator/stdcxx/trunk/tests/regress/22.locale.stdcxx-554.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/regress/22.locale.stdcxx-554.cpp?rev=577001&r1=577000&r2=577001&view=diff ============================================================================== --- incubator/stdcxx/trunk/tests/regress/22.locale.stdcxx-554.cpp (original) +++ incubator/stdcxx/trunk/tests/regress/22.locale.stdcxx-554.cpp Tue Sep 18 10:57:11 2007 @@ -25,13 +25,12 @@ **************************************************************************/ #include // for memset() +#include // for assert() #include // for std::moneypunct, std::messages -#include // for rw_test() - template -void test_moneypunct (charT, const char* name) +void test_moneypunct (charT) { typedef std::moneypunct PunctT; @@ -42,15 +41,13 @@ PunctT* p = new (buf) PunctT (); - rw_assert (fill == buf [sizeof (PunctT)], __FILE__, __LINE__, - "buf [sizeof (std::moneypunct <%s>)] expected %d, got %d\n", - name, int (fill), int (buf [sizeof (PunctT)])); + assert (fill == buf [sizeof (PunctT)]); p->~PunctT (); } template -void test_messages (charT, const char* name) +void test_messages (charT) { typedef std::messages MessagesT; @@ -61,32 +58,20 @@ MessagesT* p = new (buf) MessagesT (); - rw_assert (fill == buf [sizeof (MessagesT)], __FILE__, __LINE__, - "buf [sizeof (std::messages <%s>)] expected %d, got %d\n", - name, int (fill), int (buf [sizeof (MessagesT)])); + assert (fill == buf [sizeof (MessagesT)]); p->~MessagesT (); } -static int run_test (int, char**) +int main (int, char* []) { - test_moneypunct (char (), "char"); - test_messages (char (), "char"); + test_moneypunct (char ()); + test_messages (char ()); #ifndef _RWSTD_NO_WCHAR_T - test_moneypunct (wchar_t (), "wchar_t"); - test_messages (wchar_t (), "wchar_t"); + test_moneypunct (wchar_t ()); + test_messages (wchar_t ()); #endif return 0; -} - -int main (int argc, char* argv[]) -{ - return rw_test (argc, argv, __FILE__, - "lib.locale", - "STDCXX-544", - run_test, - "", - (void*)0); }