let unit test work after importing runc-dmz

Signed-off-by: lifubang <[email protected]>
opencontainers · Aug 15, 2023 · 7c7e825 · 7c7e825
1 parent 7adf5a5
commit 7c7e825
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/libcontainer/integration/utils_test.go b/libcontainer/integration/utils_test.go
@@ -27,6 +27,16 @@ func init() {
 	// Figure out path to get-images.sh. Note it won't work
 	// in case the compiled test binary is moved elsewhere.
 	_, ex, _, _ := runtime.Caller(0)
+	// make and copy runc-dmg
+	rootDir, err := filepath.Abs(filepath.Join(filepath.Dir(ex), "..", ".."))
+	if err != nil {
+		panic(err)
+	}
+	nowPath := getExeDir()
+	dmzMake, err := exec.Command("gcc", "-o", filepath.Join(nowPath, "integration.test-dmz"), "-static", filepath.Join(rootDir, "contrib/cmd/runc-dmz/runc-dmz.c")).CombinedOutput()
+	if err != nil {
+		panic(fmt.Errorf("make runc-dmz error %w (output: %s)", err, dmzMake))
+	}
 	getImages, err := filepath.Abs(filepath.Join(filepath.Dir(ex), "..", "..", "tests", "integration", "get-images.sh"))
 	if err != nil {
 		panic(err)
@@ -48,6 +58,15 @@ func init() {
 	}
 }
 
+func getExeDir() string {
+	exePath, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	res, _ := filepath.EvalSymlinks(filepath.Dir(exePath))
+	return res
+}
+
 func ptrInt(v int) *int {
 	return &v
 }

diff --git a/libcontainer/nsenter/nsenter_test.go b/libcontainer/nsenter/nsenter_test.go
@@ -8,6 +8,8 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -16,6 +18,29 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+func init() {
+	_, ex, _, _ := runtime.Caller(0)
+	// make and copy runc-dmg
+	rootDir, err := filepath.Abs(filepath.Join(filepath.Dir(ex), "..", ".."))
+	if err != nil {
+		panic(err)
+	}
+	nowPath := getExeDir()
+	dmzMake, err := exec.Command("gcc", "-o", filepath.Join(nowPath, "nsenter.test-dmz"), "-static", filepath.Join(rootDir, "contrib/cmd/runc-dmz/runc-dmz.c")).CombinedOutput()
+	if err != nil {
+		panic(fmt.Errorf("make runc-dmz error %w (output: %s)", err, dmzMake))
+	}
+}
+
+func getExeDir() string {
+	exePath, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+	res, _ := filepath.EvalSymlinks(filepath.Dir(exePath))
+	return res
+}
+
 func TestNsenterValidPaths(t *testing.T) {
 	args := []string{"nsenter-exec"}
 	parent, child := newPipe(t)
@@ -24,6 +49,7 @@ func TestNsenterValidPaths(t *testing.T) {
 		// join pid ns of the current process
 		fmt.Sprintf("pid:/proc/%d/ns/pid", os.Getpid()),
 	}
+	fmt.Printf("=========os.Args[0] %s\n", os.Args[0])
 	cmd := &exec.Cmd{
 		Path:       os.Args[0],
 		Args:       args,