From 96051d7c9f09e572d1ecbb5535aa163998f76e11 Mon Sep 17 00:00:00 2001 From: Ben LaHaise Date: Tue, 17 Sep 2002 16:53:01 +0000 Subject: update test cases for ia64 quirks --- ChangeLog | 5 ++++- harness/cases/10.t | 8 ++++++-- harness/cases/4.t | 4 ++++ harness/ext2-enospc.img | Bin 409600 -> 409600 bytes 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 800fea2..b918832 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,10 @@ - add rough outline for man pages - make the compiled io_getevents() add the extra parameter and pass the timeout for updating as per 2.5 - - fixes for ia64 + - fixes for ia64, now works + - fixes for x86-64 + - disable the NULL check in harness/cases/4.t on ia64: ia64 + maps the 0 page and causes this check to fail. 0.3.15 - use real syscall interface, but don't break source compatibility diff --git a/harness/cases/10.t b/harness/cases/10.t index e1ff4fe..9d3beb2 100644 --- a/harness/cases/10.t +++ b/harness/cases/10.t @@ -13,8 +13,12 @@ int test_main(void) { -#define LIMIT 8192 -#define SIZE 8192 +/* Note: changing either of these requires updating the ext2-enospc.img + * filesystem image. Also, if SIZE is less than PAGE_SIZE, problems + * crop up due to ext2's preallocation. + */ +#define LIMIT 65536 +#define SIZE 65536 char *buf; int rwfd; int status = 0, res; diff --git a/harness/cases/4.t b/harness/cases/4.t index e6b6ef5..972b4f2 100644 --- a/harness/cases/4.t +++ b/harness/cases/4.t @@ -61,7 +61,11 @@ int test_main(void) status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, READ, -EFAULT); status |= attempt(rwfd, KERNEL_RW_POINTER, SIZE, 0, WRITE, -EFAULT); + + /* Some architectures map the 0 page. Ugh. */ +#if !defined(__ia64__) status |= attempt(rwfd, NULL, SIZE, 0, WRITE, -EFAULT); +#endif return status; } diff --git a/harness/ext2-enospc.img b/harness/ext2-enospc.img index 74c0f0e..fa56745 100644 Binary files a/harness/ext2-enospc.img and b/harness/ext2-enospc.img differ -- cgit v1.2.1