Get LTP running again on SGX

LibOS/shim/test/apps/ltp/edit_sys_tests.awk

@@ -4,22 +4,29 @@ BEGIN{
 		test = $1$2$3
 		blocked[test]
 	}
+
+	if (SGX)  {
+	    pal_str = "./pal_loader SGX"
+	} else {
+	    pal_str = "./pal_loader"
+	}
 }
+
 NF && ! /^#/ {
 	test = $2$3
 	if($1=="splice02") {
-        s = "./pal_loader"
+        s = pal_str
 		for (i=2; i<=NF; i++) {
 			s = s " " $i
 			if($i=="|") {
 				i++
-				s = s " ./pal_loader " $i
+				s = s " " pal_str " " $i
 			}
 		}
 		print s
     }
 	else if(! (test in blocked)) {
-		s = "./pal_loader"
+		s = pal_str
 		for (i=2; i<=NF; i++) {
 			s = s " " $i
 		}

LibOS/shim/test/apps/ltp/fetch.py

@@ -118,7 +118,11 @@ pool = multiprocessing.Pool()
 with open('../../../../syscalls.graphene') as testcases:
     for line in testcases:
         tokens = line.split( )
-        test = tokens[1]
+        if (tokens[1] == "SGX") :
+            test = tokens[2]
+        else :
+            test = tokens[1]
+
         if test=="seq":
             test = tokens[6]     #splice02
         try: 

LibOS/shim/test/apps/ltp/syscalls.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 cd `dirname $0`
 export LTPROOT=$PWD"/opt/ltp"
-awk -f edit_sys_tests.awk $LTPROOT/runtest/syscalls > syscalls.graphene 
+awk -v SGX=$SGX_RUN -f edit_sys_tests.awk $LTPROOT/runtest/syscalls > syscalls.graphene 
 cd $LTPROOT/../..
 python fetch.py

LibOS/shim/test/regression/90_large-mmap.py

@@ -6,7 +6,7 @@ from regression import Regression
 loader = sys.argv[1]
 
 # Running Bootstrap
-regression = Regression(loader, "large-mmap", None, 30000)
+regression = Regression(loader, "large-mmap", None, 60000)
 
 regression.add_check(name="Ftruncate",
     check=lambda res: "large-mmap: ftruncate OK" in res[0].out)

Runtime/pal_loader

@@ -2,7 +2,15 @@
 
 if [ "$1" == "SGX" ]; then
 	if [ "$SGX" != "0" ]; then
-		export SGX=1
+	    export SGX=1
+	    # Sometimes, we end up with a stray SGX_RUN in the environment,
+	    # which makes the Makefile.Host unhappy
+	    unset SGX_RUN
+	    # The interaction of SGX and SGX_RUN is getting pretty unwieldly.
+	    # We should kill off SGX_RUN.  Here, we can get in trouble
+	    # if the make invocation below gets SGX_RUN via an MAKEFLAGS
+	    # from a wrapper makefile (e.g., the regression tests)
+	    unset MAKEFLAGS
 	fi
 	shift
 fi