1 files changed, 27 insertions, 0 deletions
diff --git a/extras/hs-test/framework_test.go b/extras/hs-test/framework_test.go
index 8773fa2417d..a578fb15573 100644
--- a/extras/hs-test/framework_test.go
+++ b/extras/hs-test/framework_test.go
@@ -1,13 +1,40 @@
 package main
 
 import (
+	"fmt"
+	"os"
+	"strings"
 	"testing"
+	"time"
 
+	. "fd.io/hs-test/infra"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
 func TestHst(t *testing.T) {
+	if *IsVppDebug {
+		// 30 minute timeout so that the framework won't timeout while debugging
+		TestTimeout = time.Minute * 30
+	} else {
+		TestTimeout = time.Minute * 5
+	}
+
+	output, err := os.ReadFile("/sys/devices/system/node/online")
+	if err == nil && strings.Contains(string(output), "-") {
+		NumaAwareCpuAlloc = true
+	}
+	// creates a file with PPID, used for 'make cleanup-hst'
+	ppid := fmt.Sprint(os.Getppid())
+	ppid = ppid[:len(ppid)-1]
+	f, _ := os.Create(".last_hst_ppid")
+	f.Write([]byte(ppid))
+	f.Close()
+
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "HST")
+	if *DryRun || *IsPersistent {
+		fmt.Println("\033[36m" + "Use 'make cleanup-hst' to remove IP files, " +
+			"namespaces and containers. \nPPID: " + ppid + "\033[0m")
+	}
 }