From c4498e9adb01beb34fe4ab546ddd277ffc70c1bb Mon Sep 17 00:00:00 2001
From: Don Porter <porter@cs.unc.edu>
Date: Thu, 2 Feb 2017 12:47:36 -0500
Subject: [PATCH] More fixes

---
 LibOS/shim/test/Makefile                      | 21 +++++----
 LibOS/shim/test/apps/lmbench/Makefile.lmbench |  2 +-
 LibOS/shim/test/pal_loader                    | 43 +------------------
 LibOS/shim/test/regression/00_bootstrap.py    |  2 +-
 LibOS/shim/test/regression/90_large-mmap.py   |  2 +-
 LibOS/shim/test/regression/Makefile           |  4 +-
 6 files changed, 16 insertions(+), 58 deletions(-)
 mode change 100755 => 120000 LibOS/shim/test/pal_loader

diff --git a/LibOS/shim/test/Makefile b/LibOS/shim/test/Makefile
index 285c8b82..704d1e07 100644
--- a/LibOS/shim/test/Makefile
+++ b/LibOS/shim/test/Makefile
@@ -5,21 +5,19 @@ export SYS
 
 PALDIR  = $(level)../../../Pal/src
 SHIMDIR = $(level)../src
-LIBCDIR = $(level)../../../Runtime
+RUNTIME = $(level)../../../Runtime
 
 CC = gcc
 CXX = g++
 CFLAGS 	= -std=gnu99
 CFLAGS-debug = $(CFLAGS) -I$(SHIMDIR)/../include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib
 LDFLAGS	=
-LDFLAGS-debug = $(LDFLAGS) -L$(SHIMDIR) -L$(PALDIR) \
-		-Wl,-rpath-link=$(abspath $(SHIMDIR)) \
-		-Wl,-rpath-link=$(abspath $(PALDIR))
+LDFLAGS-debug = $(LDFLAGS) -L$(SHIMDIR) -L$(PALDIR) -Wl,-rpath-link=$(abspath $(RUNTIME))
 
 default: all
 include $(PALDIR)/Makefile.Test
 
-all: $(target) $(if $(level),,build-subdirs) | $(call expand_target,$(exec_target))
+all: pal_loader $(target) $(if $(level),,build-subdirs) | $(call expand_target,$(exec_target))
 
 ifeq ($(DEBUG),1)
 CC += -g
@@ -28,15 +26,16 @@ endif
 export DEBUG
 
 manifest_rules = \
-	-e 's:\$$(PAL):$(abspath $(level)pal_loader):g' \
-	-e 's:\$$(PALDIR):'$$RELDIR'$(PALDIR):g' \
+	-e 's:\$$(PAL):$(abspath $(RUNTIME)/pal_loader):g' \
 	-e 's:\$$(PWD):$(PWD):g' \
 	-e 's:\$$(BIN):$(subst .manifest,,$(notdir $@)):g' \
-	-e 's:\$$(SHIMDIR):'$$RELDIR'$(SHIMDIR):g' \
-	-e 's:\$$(SHIMPATH):'$$RELDIR'$(SHIMDIR)/libsysdb.so:g' \
-	-e 's:\$$(LIBCDIR):'$$RELDIR'$(LIBCDIR):g' \
+	-e 's:\$$(SHIMPATH):'$$RELDIR'$(RUNTIME)/libsysdb.so:g' \
+	-e 's:\$$(LIBCDIR):'$$RELDIR'$(RUNTIME):g' \
 	$(extra_rules)
 
+pal_loader:
+	ln -s $(RUNTIME)/pal_loader
+
 relative-to = $(shell python -c "import os.path; print os.path.relpath(\"$(abspath $2)\",\"$(abspath $1)\")")
 
 %manifest: %manifest.template
@@ -52,7 +51,7 @@ manifest: manifest.template
 .PHONY: test clean
 
 clean: $(clean-extra) $(if $(level),,clean-subdirs)
-	rm -rf $(call expand_target,$(exec_target)) $(target)
+	rm -rf pal_loader $(call expand_target,$(exec_target)) $(target)
 
 build-subdirs:
 	for f in $(subdirs); do (cd $$f; $(MAKE); cd ..); done
diff --git a/LibOS/shim/test/apps/lmbench/Makefile.lmbench b/LibOS/shim/test/apps/lmbench/Makefile.lmbench
index 526ec4b0..417cbcea 100644
--- a/LibOS/shim/test/apps/lmbench/Makefile.lmbench
+++ b/LibOS/shim/test/apps/lmbench/Makefile.lmbench
@@ -15,5 +15,5 @@ include ../../../../../Makefile
 $(addsuffix .template,$(manifests)): %: ../../../%
 	ln -sf $< $@
 
-pal_loader: ../../../../pal_loader
+pal_loader: ../../../../../pal_loader
 	ln -sf $< $@
diff --git a/LibOS/shim/test/pal_loader b/LibOS/shim/test/pal_loader
deleted file mode 100755
index e82f0393..00000000
--- a/LibOS/shim/test/pal_loader
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-THIS_DIR=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
-RUNTIME_DIR=$(readlink -f $THIS_DIR/../../../Runtime)
-OS=$(make --quiet -f $THIS_DIR/../../../Pal/src/Makefile.Host print_host)
-
-MANIFEST=
-GDB_CMD=
-PAL_CMD=$RUNTIME_DIR/pal-$OS
-
-if [ "$GDB" == "1" ]; then
-	GDB="gdb"
-fi
-
-if [ "$GDB" != "" ] && [ "$GDB" != "0" ]; then
-	GDB_CMD="$GDB --args"
-fi
-
-if [ "$SEC" == "1" ]; then
-	echo "Use reference monitor"
-	PAL_CMD=$RUNTIME_DIR/pal_sec-$OS
-fi
-
-while [ "$1" != "" ];
-do
-	if [ "$MANIFEST" == "" ]; then
-		MANIFEST=$1
-		shift
-		continue
-	fi
-
-	break
-done
-
-if [ ! -f "$PAL_CMD" ]; then
-	echo "$PAL_CMD is not built, or security mode is not supported"
-	exit 1
-fi
-
-set -x
-
-exec $GDB_CMD $PAL_CMD $MANIFEST "$@"
diff --git a/LibOS/shim/test/pal_loader b/LibOS/shim/test/pal_loader
new file mode 120000
index 00000000..508715d1
--- /dev/null
+++ b/LibOS/shim/test/pal_loader
@@ -0,0 +1 @@
+../../../Runtime/pal_loader
\ No newline at end of file
diff --git a/LibOS/shim/test/regression/00_bootstrap.py b/LibOS/shim/test/regression/00_bootstrap.py
index 0a503116..2c4f9017 100644
--- a/LibOS/shim/test/regression/00_bootstrap.py
+++ b/LibOS/shim/test/regression/00_bootstrap.py
@@ -3,7 +3,7 @@
 import os, sys, mmap
 from regression import Regression
 
-loader = './pal'
+loader = sys.argv[1]
 
 # Running Bootstrap
 regression = Regression(loader, "bootstrap")
diff --git a/LibOS/shim/test/regression/90_large-mmap.py b/LibOS/shim/test/regression/90_large-mmap.py
index cd51c40b..d55e0caf 100644
--- a/LibOS/shim/test/regression/90_large-mmap.py
+++ b/LibOS/shim/test/regression/90_large-mmap.py
@@ -3,7 +3,7 @@
 import os, sys, mmap
 from regression import Regression
 
-loader = './pal'
+loader = sys.argv[1]
 
 # Running Bootstrap
 regression = Regression(loader, "large-mmap")
diff --git a/LibOS/shim/test/regression/Makefile b/LibOS/shim/test/regression/Makefile
index eda2cf78..816b5f7e 100644
--- a/LibOS/shim/test/regression/Makefile
+++ b/LibOS/shim/test/regression/Makefile
@@ -46,9 +46,9 @@ PYTHONENV="PYTHONPATH=../../../../Scripts"
 
 regression: $(target)
 	@echo "\n\nBasic Bootstrapping:"
-	@for f in $(wildcard 00_*.py); do env $(PYTHONENV) python $$f; done
+	@for f in $(wildcard 00_*.py); do env $(PYTHONENV) python $$f $(RUNTIME)/pal-$(PAL_HOST); done
 	@echo "\n\nLarge File Support:"
-	@for f in $(wildcard 90_*.py); do env $(PYTHONENV) python $$f; done
+	@for f in $(wildcard 90_*.py); do env $(PYTHONENV) python $$f $(RUNTIME)/pal-$(PAL_HOST); done
 	@echo "\n\nLTP tests for system calls:"
 	../apps/ltp/syscalls.sh