Remove long blocking memguard test and switch to memguard jailhouse branch

diff --git a/jailhouse b/jailhouse
index 92ab6d47421d39155980908ef0d6cf04cd0d7c3d..3e7d5abccfd59eb737115666cd045bcd3cf43021 160000 (submodule)
--- a/jailhouse
+++ b/jailhouse
@@ -1 +1 @@
-Subproject commit 92ab6d47421d39155980908ef0d6cf04cd0d7c3d
+Subproject commit 3e7d5abccfd59eb737115666cd045bcd3cf43021

diff --git a/test/memguard-test.c b/test/memguard-test.c
index e8bd33ea8ce385d5fb3887b804ef1b920bdd6ce0..1a88f88044c3f06216df2f0a301878a3df15797b 100644 (file)
--- a/test/memguard-test.c
+++ b/test/memguard-test.c
@@ -172,9 +172,6 @@ void *test_thread(void *ptr)
        for (uint64_t flags = 0; flags < 4; flags++) {
                compute_kernel(1); /* warm up */
 
-               r = MGTEST(500, 10000, flags, compute_kernel(17*1000*1000));
-               continue;
-
                ///////////////////////////////////////////////////////
                r = MGTEST(5000, 10000, flags, compute_kernel(1000));
                WVPASS(!r.time_ovf);