Merge branch 'master' into iptables-1-pkg

Change-Id: I7457a11de4725e1bf3811420c505d225b1cb6943

1 files changed, 11 insertions, 3 deletions

diff --git a/test/syscalls/syscall_test_runner.go b/test/syscalls/syscall_test_runner.go
index 9a8e0600b..476248184 100644
--- a/test/syscalls/syscall_test_runner.go
+++ b/test/syscalls/syscall_test_runner.go
@@ -47,6 +47,7 @@ var (
 	platform   = flag.String("platform", "ptrace", "platform to run on")
 	useTmpfs   = flag.Bool("use-tmpfs", false, "mounts tmpfs for /tmp")
 	fileAccess = flag.String("file-access", "exclusive", "mounts root in exclusive or shared mode")
+	overlay    = flag.Bool("overlay", false, "wrap filesystem mounts with writable tmpfs overlay")
 	parallel   = flag.Bool("parallel", false, "run tests in parallel")
 	runscPath  = flag.String("runsc", "", "path to runsc binary")
 )
@@ -184,10 +185,13 @@ func runTestCaseRunsc(testBin string, tc gtest.TestCase, t *testing.T) {
 		"-platform", *platform,
 		"-root", rootDir,
 		"-file-access", *fileAccess,
-		"--network=none",
+		"-network=none",
 		"-log-format=text",
 		"-TESTONLY-unsafe-nonroot=true",
-		"--net-raw=true",
+		"-net-raw=true",
+	}
+	if *overlay {
+		args = append(args, "-overlay")
 	}
 	if *debug {
 		args = append(args, "-debug", "-log-packets=true")
@@ -196,7 +200,11 @@ func runTestCaseRunsc(testBin string, tc gtest.TestCase, t *testing.T) {
 		args = append(args, "-strace")
 	}
 	if outDir, ok := syscall.Getenv("TEST_UNDECLARED_OUTPUTS_DIR"); ok {
-		debugLogDir, err := ioutil.TempDir(outDir, "runsc")
+		tdir := filepath.Join(outDir, strings.Replace(tc.FullName(), "/", "_", -1))
+		if err := os.MkdirAll(tdir, 0755); err != nil {
+			t.Fatalf("could not create test dir: %v", err)
+		}
+		debugLogDir, err := ioutil.TempDir(tdir, "runsc")
 		if err != nil {
 			t.Fatalf("could not create temp dir: %v", err)
 		}