memguard-test: Implement full wvtest protocol

diff --git a/test/memguard-test.c b/test/memguard-test.c
index dde5f6441de7e751cbcd6481693916fdc3889376..3fba44aee108d1be454cec40f99a05831263619a 100644 (file)
--- a/test/memguard-test.c
+++ b/test/memguard-test.c
@@ -121,10 +121,11 @@ static void print_test_info(uint64_t timeout_us, uint64_t mem_budget, uint64_t f
                 flags & MGF_MASK_INT ? 'I' : '-'
                );
        struct mg_ret r = mgret(retval);
-       printf("%-40s %-25s ⇒ time:%8u%c mem:%8u%c\n",
+       printf("Testing \"%-40s %-25s ⇒ time:%8u%c mem:%8u%c\" in %s:\n",
               call, code,
               r.time, r.time_ovf ? '!' : ' ',
-              r.mem, r.mem_ovf ? '!' : ' ');
+              r.mem, r.mem_ovf ? '!' : ' ',
+              __FILE__);
 }
 
 void wvtest_pass(bool cond, const char* file, int line, const char* str)
@@ -212,27 +213,27 @@ int main(int argc, char *argv[])
                ///////////////////////////////////////////////////////
                r = MGTEST(100000, 5000000, flags, read_memory(1000000));
                WVPASS(!r.mem_ovf);
-               WVPASS(r.mem >= 100000);
+               WVPASS(r.mem >= 900000);
 
                r = MGTEST(100000, 500000,  flags, read_memory(1000000));
                WVPASS(r.mem_ovf);
-               WVPASS(r.mem >= 100000);
+               WVPASS(r.mem >= 900000);
 
                r = MGTEST(100000, 5000000, flags, read_memory_rnd(1000000));
                WVPASS(!r.mem_ovf);
-               WVPASS(r.mem >= 100000);
+               WVPASS(r.mem >= 900000);
 
                r = MGTEST(100000, 500000,  flags, read_memory_rnd(1000000));
                WVPASS(r.mem_ovf);
-               WVPASS(r.mem >= 100000);
+               WVPASS(r.mem >= 900000);
 
                r = MGTEST(100000, 5000000, flags, write_memory(1000000));
                WVPASS(!r.mem_ovf);
-               WVPASS(r.mem >= 100000);
+               WVPASS(r.mem >= 900000);
 
                r = MGTEST(100000, 500000,  flags, write_memory(1000000));
                WVPASS(r.mem_ovf);
-               WVPASS(r.mem >= 100000);
+               WVPASS(r.mem >= 900000);
 
                printf("\n");
        }