From: Michal Sojka <michal.sojka@cvut.cz>
Date: Mon, 5 Nov 2018 10:28:29 +0000 (+0100)
Subject: Remove long blocking memguard test and switch to memguard jailhouse branch
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/hercules2020/jailhouse-build.git/commitdiff_plain/88c04a4a2fe959b866fffb5f50f8dde145f769dd

Remove long blocking memguard test and switch to memguard jailhouse branch
---

diff --git a/jailhouse b/jailhouse
index 92ab6d4..3e7d5ab 160000
--- 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 e8bd33e..1a88f88 100644
--- 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);