Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 45143 invoked from network); 6 Apr 2011 12:38:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Apr 2011 12:38:52 -0000 Received: (qmail 90350 invoked by uid 500); 6 Apr 2011 12:38:52 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 90307 invoked by uid 500); 6 Apr 2011 12:38:51 -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 90300 invoked by uid 99); 6 Apr 2011 12:38:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2011 12:38:51 +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; Wed, 06 Apr 2011 12:38:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C1C5F23889BF; Wed, 6 Apr 2011 12:38:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1089428 - /apr/apr/trunk/test/testsock.c Date: Wed, 06 Apr 2011 12:38:28 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110406123828.C1C5F23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Wed Apr 6 12:38:28 2011 New Revision: 1089428 URL: http://svn.apache.org/viewvc?rev=1089428&view=rev Log: add a missing server socket close remove AF_UNIX socket from filsystem before trying to bind, in case it exists from a previous run Modified: apr/apr/trunk/test/testsock.c Modified: apr/apr/trunk/test/testsock.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testsock.c?rev=1089428&r1=1089427&r2=1089428&view=diff ============================================================================== --- apr/apr/trunk/test/testsock.c (original) +++ apr/apr/trunk/test/testsock.c Wed Apr 6 12:38:28 2011 @@ -491,6 +491,9 @@ static void test_wait(abts_case *tc, voi rv = apr_socket_wait(client, APR_WAIT_READ); APR_ASSERT_SUCCESS(tc, "Wait for socket failed", rv); + + rv = apr_socket_close(server); + APR_ASSERT_SUCCESS(tc, "couldn't close server socket", rv); } abts_suite *testsock(abts_suite *suite) @@ -510,6 +513,8 @@ abts_suite *testsock(abts_suite *suite) #if APR_HAVE_SOCKADDR_UN socket_name = UNIX_SOCKET_NAME; socket_type = APR_UNIX; + /* in case AF_UNIX socket exists from a previous run: */ + apr_file_remove(socket_name, p); abts_run_test(suite, test_create_bind_listen, NULL); abts_run_test(suite, test_send, NULL); abts_run_test(suite, test_recv, NULL);