From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JsK5R-0000PA-Hm for qemu-devel@nongnu.org; Sat, 03 May 2008 11:55:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JsK5Q-0000Ow-Py for qemu-devel@nongnu.org; Sat, 03 May 2008 11:55:44 -0400 Received: from [199.232.76.173] (port=46507 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JsK5Q-0000Ot-Mx for qemu-devel@nongnu.org; Sat, 03 May 2008 11:55:44 -0400 Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JsK5Q-0000dp-DD for qemu-devel@nongnu.org; Sat, 03 May 2008 11:55:44 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1JsK5P-0007RP-Pq for qemu-devel@nongnu.org; Sat, 03 May 2008 15:55:43 +0000 Received: from edgar_igl by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1JsK5P-0007RL-IY for qemu-devel@nongnu.org; Sat, 03 May 2008 15:55:43 +0000 MIME-Version: 1.0 Errors-To: edgar_igl Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: "Edgar E. Iglesias" Message-Id: Date: Sat, 03 May 2008 15:55:43 +0000 Subject: [Qemu-devel] [4308] Correct broken test for fixed file mmaps. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4308 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4308 Author: edgar_igl Date: 2008-05-03 15:55:42 +0000 (Sat, 03 May 2008) Log Message: ----------- Correct broken test for fixed file mmaps. Modified Paths: -------------- trunk/tests/test-mmap.c Modified: trunk/tests/test-mmap.c =================================================================== --- trunk/tests/test-mmap.c 2008-05-03 11:06:59 UTC (rev 4307) +++ trunk/tests/test-mmap.c 2008-05-03 15:55:42 UTC (rev 4308) @@ -377,12 +377,12 @@ void check_file_fixed_mmaps(void) { - unsigned int *addr; + unsigned char *addr; unsigned int *p1, *p2, *p3, *p4; int i; /* Find a suitable address to start with. */ - addr = mmap(NULL, pagesize * 44 * 3, PROT_READ, + addr = mmap(NULL, pagesize * 40 * 4, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); fprintf (stderr, "%s addr=%p", __func__, (void *)addr); @@ -405,10 +405,10 @@ /* Make sure we get pages aligned with the pagesize. The target expects this. */ - fail_unless (p1 == addr); - fail_unless (p2 == addr + pagesize); - fail_unless (p3 == addr + pagesize * 2); - fail_unless (p4 == addr + pagesize * 3); + fail_unless (p1 == (void *)addr); + fail_unless (p2 == (void *)addr + pagesize); + fail_unless (p3 == (void *)addr + pagesize * 2); + fail_unless (p4 == (void *)addr + pagesize * 3); /* Verify that the file maps was made correctly. */ fail_unless (*p1 == 0); @@ -425,7 +425,7 @@ munmap (p2, pagesize); munmap (p3, pagesize); munmap (p4, pagesize); - addr += pagesize * 3; + addr += pagesize * 4; } fprintf (stderr, " passed\n"); }