From commits-return-11961-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sat Apr 02 14:57:19 2011 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 43466 invoked from network); 2 Apr 2011 14:57:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Apr 2011 14:57:18 -0000 Received: (qmail 2111 invoked by uid 500); 2 Apr 2011 14:57:18 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 2070 invoked by uid 500); 2 Apr 2011 14:57:18 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 2063 invoked by uid 99); 2 Apr 2011 14:57:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2011 14:57:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2011 14:57:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B3C7B23889BB; Sat, 2 Apr 2011 14:56:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1088044 - /apr/apr-util/branches/1.3.x/test/testpass.c Date: Sat, 02 Apr 2011 14:56:57 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110402145657.B3C7B23889BB@eris.apache.org> Author: trawick Date: Sat Apr 2 14:56:57 2011 New Revision: 1088044 URL: http://svn.apache.org/viewvc?rev=1088044&view=rev Log: Grab apr trunk r1088039: avoid trying to test crypt[_r]()-based hash on the three platforms which don't provide it (apr-util exports no feature test for this) Modified: apr/apr-util/branches/1.3.x/test/testpass.c Modified: apr/apr-util/branches/1.3.x/test/testpass.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testpass.c?rev=1088044&r1=1088043&r2=1088044&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/test/testpass.c (original) +++ apr/apr-util/branches/1.3.x/test/testpass.c Sat Apr 2 14:56:57 2011 @@ -28,6 +28,14 @@ #include "abts.h" #include "testutil.h" +#if defined(WIN32) || defined(BEOS) || defined(NETWARE) +#define CRYPT_ALGO_SUPPORTED 0 +#else +#define CRYPT_ALGO_SUPPORTED 1 +#endif + +#if CRYPT_ALGO_SUPPORTED + static struct { const char *password; const char *hash; @@ -104,6 +112,8 @@ static void test_threadsafe(abts_case *t } #endif +#endif /* CRYPT_ALGO_SUPPORTED */ + static void test_shapass(abts_case *tc, void *data) { const char *pass = "hellojed"; @@ -130,10 +140,12 @@ abts_suite *testpass(abts_suite *suite) { suite = ADD_SUITE(suite); +#if CRYPT_ALGO_SUPPORTED abts_run_test(suite, test_crypt, NULL); #if APR_HAS_THREADS abts_run_test(suite, test_threadsafe, NULL); #endif +#endif /* CRYPT_ALGO_SUPPORTED */ abts_run_test(suite, test_shapass, NULL); abts_run_test(suite, test_md5pass, NULL);