From e101d498a184aad476b87a18879cd805eff6fb0c Mon Sep 17 00:00:00 2001
From: Chia-Che Tsai <chitsai@cs.stonybrook.edu>
Date: Mon, 14 Aug 2017 21:16:11 -0400
Subject: [PATCH] lock the LTP version to 20170116

---
 LibOS/shim/test/apps/ltp/Makefile          | 12 +++++++-----
 LibOS/shim/test/apps/ltp/manifest.template |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/LibOS/shim/test/apps/ltp/Makefile b/LibOS/shim/test/apps/ltp/Makefile
index 1799c44a..998b07f2 100644
--- a/LibOS/shim/test/apps/ltp/Makefile
+++ b/LibOS/shim/test/apps/ltp/Makefile
@@ -1,4 +1,6 @@
-SRCDIR = ltp-master
+SRCURL = https://github.com/linux-test-project/ltp/releases/download/
+SRCVERSION = 20170116
+SRCDIR = ltp-full-$(SRCVERSION)
 BUILDDIR = opt/ltp
 TESTCASEDIR = $(BUILDDIR)/testcases/bin
 
@@ -10,11 +12,11 @@ clean-extra = clean-build
 level = ../../
 include ../../Makefile
 
-master.zip:
-	wget https://github.com/linux-test-project/ltp/archive/master.zip
+$(SRCDIR).tar.xz:
+	wget $(SRCURL)/$(SRCVERSION)/$@
 
-$(SRCDIR)/configure: master.zip
-	unzip master.zip
+$(SRCDIR)/configure: $(SRCDIR).tar.xz
+	tar -xJf $<
 	cd $(SRCDIR) && make autotools
 
 $(BUILDDIR)/runltp: $(SRCDIR)/configure
diff --git a/LibOS/shim/test/apps/ltp/manifest.template b/LibOS/shim/test/apps/ltp/manifest.template
index 5482ea06..473a2581 100644
--- a/LibOS/shim/test/apps/ltp/manifest.template
+++ b/LibOS/shim/test/apps/ltp/manifest.template
@@ -2,10 +2,6 @@ loader.preload = file:$(SHIMPATH)
 loader.env.LD_LIBRARY_PATH = /lib:/lib64:/usr/lib:/usr/lib64
 loader.debug_type = none
 
-fs.mount.tmp1.type = chroot
-fs.mount.tmp1.path = /tmp
-fs.mount.tmp1.uri = file:/tmp
-
 fs.mount.shm.type = chroot
 fs.mount.shm.path = /dev/shm
 fs.mount.shm.uri = file:/dev/shm
@@ -18,6 +14,10 @@ fs.mount.usr.type = chroot
 fs.mount.usr.path = /usr
 fs.mount.usr.uri = file:/usr
 
+fs.mount.tmp.type = chroot
+fs.mount.tmp.path = /tmp
+fs.mount.tmp.uri = file:/tmp
+
 sys.brk.size = 32M
 sys.stack.size = 4M