Small test fixes

2 files changed, 6 insertions, 4 deletions

diff --git a/test/access.c b/test/access.c
index e7676a7..22e2fb8 100755
--- a/test/access.c
+++ b/test/access.c
@@ -1,5 +1,6 @@
 #include "cachepc_user.h"
 
+#include <sys/ioctl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -7,14 +8,13 @@
 #include <err.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <stropts.h>
 
 int
 main(int argc, const char **argv)
 {
 	uint32_t arg;
-	size_t i, len;
 	int fd, ret;
+	size_t i;
 
 	fd = open("/proc/cachepc", O_RDONLY);
 	if (fd < 0) err(1, "open");
diff --git a/test/eviction.c b/test/eviction.c
index 7cdb665..e68132b 100755
--- a/test/eviction.c
+++ b/test/eviction.c
@@ -18,15 +18,17 @@ main(int argc, const char **argv)
 	int fd, ret;
 
 	fd = open("/proc/cachepc", O_RDONLY);
+	if (fd < 0) err(1, "open");
 
 	arg = 48;
 	if (argc == 2) arg = atoi(argv[1]);
 
 	ret = ioctl(fd, CACHEPC_IOCTL_TEST_EVICTION, &arg);
-	if (ret == -1) err(1, "ioctl fail");
+	if (ret == -1) err(1, "ioctl");
 
 	len = read(fd, counts, sizeof(counts));
-	assert(len == sizeof(counts));
+	if (len != sizeof(counts))
+		errx(1, "invalid count read");
 
 	for (i = 0; i < 64; i++) {
 		if (i % 16 == 0 && i)