Fix tests

Author: HuanCheng65

grader_config.toml

@@ -5,15 +5,15 @@ show_test_build_hint = false
 [setup]
 # 在运行测试之前需要执行的准备步骤
 
-[[setup.steps]]
-name = "Compile tsh"
-type = "command"
-command = "make"
-args = ["all", "-j"]
-required = true                               # 如果这一步失败，则终止所有测试
-message = "Preparing tsh..."
-success_message = "tsh compiled successfully"
-timeout = 60.0
+# [[setup.steps]]
+# name = "Compile tsh"
+# type = "command"
+# command = "make"
+# args = ["all", "-j"]
+# required = true                               # 如果这一步失败，则终止所有测试
+# message = "Preparing tsh..."
+# success_message = "tsh compiled successfully"
+# timeout = 60.0
 
 [paths]
 tests_dir = "tests"

tests/cases/12-sigtstp-proc-group/check_ps_output.py

@@ -7,8 +7,8 @@
 def check_ps_output(stdout):
     """
     Check that the ps output contains:
-    1. The header line with PID, TTY, STAT, TIME, COMMAND
-    2. At least one "mysplit 4" process with T (stopped) status
+    1. The header line (more flexible format checking)
+    2. At least one "mysplit 4" process with stopped status (T, T+, Ts, etc.)
     3. The shell process itself
     """
     lines = stdout.strip().split("\n")
@@ -25,25 +25,27 @@ def check_ps_output(stdout):
 
     ps_output = lines[ps_output_start:]
 
-    # Check header
-    if not ps_output or not re.match(
-        r"\s*PID\s+TTY\s+STAT\s+TIME\s+COMMAND", ps_output[0]
+    # Check header - more flexible now
+    if not ps_output or not (
+        all(col in ps_output[0].upper() for col in ["PID", "TTY", "STAT", "TIME"])
+        and any(col in ps_output[0].upper() for col in ["COMMAND", "CMD"])
     ):
         return False, "Missing or invalid ps output header"
 
-    # Check for stopped mysplit processes
+    # Check for stopped mysplit processes - support more status formats
     mysplit_stopped = False
 
     for line in ps_output[1:]:  # Skip header
         if not line.strip():
             continue
 
-        # Look for stopped mysplit processes (STAT should be T)
-        if "./mysplit 4" in line and re.search(r"\bT\b", line):
+        # Look for stopped mysplit processes with various stop status indicators
+        if "./mysplit 4" in line and re.search(r'\b(T|Ts|T\+|STOPPED)\b', line, re.IGNORECASE):
             mysplit_stopped = True
+            break
 
     if not mysplit_stopped:
-        return False, "No stopped mysplit processes found (STAT should be T)"
+        return False, "No stopped mysplit processes found"
 
     return True, "PS output correctly shows stopped processes"
 

tests/cases/12-sigtstp-proc-group/config.toml

@@ -23,7 +23,7 @@ wait_for_output = true
 
 [[run.steps]]
 type = "sleep"
-seconds = 2
+seconds = 1
 
 [[run.steps]]
 type = "signal"

tests/cases/17-cd/config.toml

@@ -17,15 +17,15 @@ args = ["-p"]
 
 [[run.steps]]
 type = "input"
-content = "pwd"
+content = "/bin/pwd"
 
 [[run.steps]]
 type = "input"
 content = "cd .."
 
 [[run.steps]]
 type = "input"
-content = "pwd"
+content = "/bin/pwd"
 
 [[run.steps]]
 type = "close"

tests/cases/18-io-redirect/config.toml

@@ -18,20 +18,20 @@ args = ["-p"]
 # 测试输出重定向
 [[run.steps]]
 type = "input"
-content = "echo 'Hello, World!' > output.txt"
+content = "/bin/echo 'Hello, World!' > output.txt"
 
 [[run.steps]]
 type = "input"
-content = "cat output.txt"
+content = "/bin/cat output.txt"
 
 # 测试输入重定向
 [[run.steps]]
 type = "input"
-content = "echo 'Test input redirection' > input.txt"
+content = "/bin/echo 'Test input redirection' > input.txt"
 
 [[run.steps]]
 type = "input"
-content = "cat < input.txt"
+content = "/bin/cat < input.txt"
 
 # 关闭 shell
 [[run.steps]]