feat: add ns_last_pid extension test and enhance test framework

- Add comprehensive test for ns_last_pid extension
- Improve test script JSON merging capabilities
- Update existing tests and CMake configuration

Signed-off-by: ComixHe <ComixHe1895@outlook.com>

Author: ComixHe

CMakeLists.txt

@@ -195,8 +195,7 @@ if(NOT linyaps-box_MAKE_RELEASE)
     COMMAND git rev-parse --short=7 HEAD
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_COMMIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   set(LINYAPS_BOX_VERSION "${LINYAPS_BOX_VERSION}-dev-${GIT_COMMIT_HASH}")
 endif()
@@ -438,7 +437,8 @@ function(setup_linyaps_box_smoke_tests)
       ./tests/ll-box-st/09-check-rlimit.json
       ./tests/ll-box-st/10-check-oom.json
       ./tests/ll-box-st/11-output-to-null.json
-      ./tests/ll-box-st/12-bind-host-dev.json)
+      ./tests/ll-box-st/12-bind-host-dev.json
+      ./tests/ll-box-st/13-pid-extension.json)
 
   foreach(test ${linyaps-box_SMOKE_TESTS})
     add_test(

tests/ll-box-st/12-bind-host-dev.json

@@ -5,7 +5,7 @@
 			"uid": 0,
 			"gid": 0
 		},
-		"args": ["/bin/env", "bash", "-c", "pwd"],
+		"args": ["true"],
 		"env": [
 			"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
 			"TERM=xterm",

tests/ll-box-st/13-pid-extension.json

@@ -0,0 +1,29 @@
+{
+	"name": "Set ns_last_pid",
+	"process": {
+		"user": {
+			"uid": 0,
+			"gid": 0
+		},
+		"args": ["/bin/env", "bash", "-c", "cat /proc/sys/kernel/ns_last_pid"],
+		"env": [
+			"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+			"TERM=xterm",
+			"HOME=/root"
+		],
+		"cwd": "/"
+	},
+	"annotations": {
+		"cn.org.linyaps.runtime.ns_last_pid": "100"
+	},
+	"linux": {
+		"readonlyPaths": [
+			"/proc/asound",
+			"/proc/bus",
+			"/proc/fs",
+			"/proc/irq",
+			"/proc/sysrq-trigger"
+		]
+	},
+	"expected": "100"
+}

tests/ll-box-st/ll-box-st

@@ -175,17 +175,22 @@ function run_test() {
 	mkdir -p -- "${TEST_DIR}"
 
 	local TEST_CONFIG="${TEST_DIR}/test_config.json"
-	# patch process from test file
-	"${JQ}" >"${TEST_CONFIG}" \
-		".process |= $("${JQ}" -r '.process' "${TEST_FILE}" || true)" \
-		"${BUNDLE_DIR}/config.json"
-
-	# patch mount from test file if test file has mount field
-	if "${JQ}" -e '.mounts' "${TEST_FILE}" &>/dev/null; then
-		"${JQ}" >"${TEST_CONFIG}" \
-			".mounts |= $("${JQ}" -r '.mounts' "${TEST_FILE}" || true)" \
-			"${BUNDLE_DIR}/config.json"
-	fi
+
+	# Create a copy of the original config and apply all patches at once
+	"${JQ}" -s '
+		.[0] as $base |
+		.[1] as $patch |
+		$base * {
+			process: ($patch.process // $base.process),
+			mounts: ($patch.mounts // $base.mounts),
+			annotations: ($patch.annotations // $base.annotations),
+			linux: (if $patch.linux then
+				$base.linux * $patch.linux
+			else
+				$base.linux
+			end)
+		}
+	' "${BUNDLE_DIR}/config.json" "${TEST_FILE}" > "${TEST_CONFIG}"
 
 	local CONTAINER_NAME
 	CONTAINER_NAME="$(basename -- "${TEST_FILE_NAME}" .json)"