From 0fe0e028d83a57907d574d7707539c26526bcc8a Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 11 Apr 2019 16:46:18 -0700 Subject: [PATCH] [LibOS/test/native] Add manifest template to make exec_fork and script work + fix tcp test `tcp` test reads tcp.c. This patch adds it to manifest.template to make the test work. --- .../test/native/exec_fork.manifest.template | 24 +++++++++++++++++ LibOS/shim/test/native/manifest.template | 1 + .../shim/test/native/script.manifest.template | 27 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 LibOS/shim/test/native/exec_fork.manifest.template create mode 100644 LibOS/shim/test/native/script.manifest.template diff --git a/LibOS/shim/test/native/exec_fork.manifest.template b/LibOS/shim/test/native/exec_fork.manifest.template new file mode 100644 index 00000000..eb85f46f --- /dev/null +++ b/LibOS/shim/test/native/exec_fork.manifest.template @@ -0,0 +1,24 @@ +loader.preload = file:$(SHIMPATH) +loader.env.LD_LIBRARY_PATH = /lib +loader.debug_type = inline +loader.syscall_symbol = syscalldb + +fs.mount.lib.type = chroot +fs.mount.lib.path = /lib +fs.mount.lib.uri = file:$(LIBCDIR) + +fs.mount.bin.type = chroot +fs.mount.bin.path = /bin +fs.mount.bin.uri = file:/bin + +sys.brk.size = 32M +sys.stack.size = 4M + +sgx.trusted_files.ld = file:$(LIBCDIR)/ld-linux-x86-64.so.2 +sgx.trusted_files.libc = file:$(LIBCDIR)/libc.so.6 +sgx.trusted_files.libdl = file:$(LIBCDIR)/libdl.so.2 +sgx.trusted_files.libm = file:$(LIBCDIR)/libm.so.6 +sgx.trusted_files.libpthread = file:$(LIBCDIR)/libpthread.so.0 + +sgx.trusted_files.fork = file:fork +sgx.trusted_children.fork = file:fork.sig diff --git a/LibOS/shim/test/native/manifest.template b/LibOS/shim/test/native/manifest.template index 6714c1c2..be02e5f1 100644 --- a/LibOS/shim/test/native/manifest.template +++ b/LibOS/shim/test/native/manifest.template @@ -27,3 +27,4 @@ sgx.trusted_files.libm = file:$(LIBCDIR)/libm.so.6 sgx.trusted_files.libpthread = file:$(LIBCDIR)/libpthread.so.0 sgx.trusted_files.unix_pipe = file:unix.c +sgx.trusted_files.tcp_c = file:tcp.c diff --git a/LibOS/shim/test/native/script.manifest.template b/LibOS/shim/test/native/script.manifest.template new file mode 100644 index 00000000..453d27cc --- /dev/null +++ b/LibOS/shim/test/native/script.manifest.template @@ -0,0 +1,27 @@ +loader.preload = file:$(SHIMPATH) +loader.env.LD_LIBRARY_PATH = /lib +loader.debug_type = inline +loader.syscall_symbol = syscalldb + +fs.mount.lib.type = chroot +fs.mount.lib.path = /lib +fs.mount.lib.uri = file:$(LIBCDIR) + +fs.mount.bin.type = chroot +fs.mount.bin.path = /bin +fs.mount.bin.uri = file:/bin + +sys.brk.size = 32M +sys.stack.size = 4M + +sgx.trusted_files.ld = file:$(LIBCDIR)/ld-linux-x86-64.so.2 +sgx.trusted_files.libc = file:$(LIBCDIR)/libc.so.6 +sgx.trusted_files.libdl = file:$(LIBCDIR)/libdl.so.2 +sgx.trusted_files.libm = file:$(LIBCDIR)/libm.so.6 +sgx.trusted_files.libpthread = file:$(LIBCDIR)/libpthread.so.0 + +sgx.trusted_files.script1_sh = file:script1.sh +sgx.trusted_files.script2_sh = file:script2.sh +sgx.trusted_files.script3_sh = file:script3.sh +sgx.trusted_files.helloworld = file:helloworld +sgx.trusted_children.helloworld = file:helloworld.sig