From: David van Moolenbroek <david@minix3.org>
Date: Fri, 5 Aug 2016 10:32:04 +0000 (+0000)
Subject: tests: fix bug in sys_vumap test
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=refs%2Fchanges%2F50%2F3350%2F1;p=minix.git

tests: fix bug in sys_vumap test

Ever since a VM allocation strategy change, this test is fully
dysfunctional.  It should be repaired and added to the regular
test set, but that will require some work.

For now, keep it in reasonable shape.

Reported by dcb314.

This closes #153.

Change-Id: Ia57bdfdf6a3fc8d47cae76a0be9881fb4d796f6d
---

diff --git a/minix/tests/kernel/sys_vumap/vumaptest.c b/minix/tests/kernel/sys_vumap/vumaptest.c
index 0b2627d7a..0dc00b939 100644
--- a/minix/tests/kernel/sys_vumap/vumaptest.c
+++ b/minix/tests/kernel/sys_vumap/vumaptest.c
@@ -2,6 +2,7 @@
 #include <minix/drivers.h>
 #include <minix/ds.h>
 #include <sys/mman.h>
+#include <machine/vmparam.h>
 #include <assert.h>
 
 #include "com.h"
@@ -1075,7 +1076,7 @@ static void test_access(void)
 
 	expect(r == OK);
 	/* Same story but more possibilities. I hope I got this right. */
-	expect(pcount >= 3 || pcount <= 6);
+	expect(pcount >= 3 && pcount <= 6);
 	for (i = 0; i < 7; i++)
 		expect(is_buf_allocated(&buf[i]));
 	expect(pvecp[0].vp_addr = buf[0].phys);