Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 26544 invoked from network); 15 May 2004 19:51:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 May 2004 19:51:52 -0000 Received: (qmail 72811 invoked by uid 500); 15 May 2004 19:51:54 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 72761 invoked by uid 500); 15 May 2004 19:51:54 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 72741 invoked by uid 98); 15 May 2004 19:51:54 -0000 X-Qmail-Scanner-Mail-From: rbb@apache.org via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 0.123926 secs) Date: 15 May 2004 19:51:50 -0000 Message-ID: <20040515195150.26525.qmail@minotaur.apache.org> From: rbb@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/test testshm.c X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N rbb 2004/05/15 12:51:50 Modified: test testshm.c Log: If we can't create the shared memory segment, don't try to keep going through the test. Doing so causes a segfault to occur. Re-enable this test. Revision Changes Path 1.16 +4 -1 apr/test/testshm.c Index: testshm.c =================================================================== RCS file: /home/cvs/apr/test/testshm.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- testshm.c 14 May 2004 14:43:22 -0000 1.15 +++ testshm.c 15 May 2004 19:51:50 -0000 1.16 @@ -168,6 +168,9 @@ rv = apr_shm_create(&shm, SHARED_SIZE, SHARED_FILENAME, p); apr_assert_success(tc, "Error allocating shared memory block", rv); + if (rv != APR_SUCCESS) { + return; + } ABTS_PTR_NOTNULL(tc, shm); retsize = apr_shm_size_get(shm); @@ -224,7 +227,7 @@ #if APR_HAS_FORK abts_run_test(suite, test_anon, NULL); #endif - /* abts_run_test(suite, test_named, NULL); */ + abts_run_test(suite, test_named, NULL); #endif return suite;