Merge branch 'main' into test/kill

Signed-off-by: Akiyama <[email protected]>
youki-dev · Feb 2, 2025 · a08fd60 · a08fd60
2 parents da9ceae + c7a10ac
commit a08fd60
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/contest/contest/src/main.rs b/tests/contest/contest/src/main.rs
@@ -129,7 +129,10 @@ fn main() -> Result<()> {
     let process_rlimits_fail = get_process_rlimits_fail_test();
     let no_pivot = get_no_pivot_test();
     let process_oom_score_adj = get_process_oom_score_adj_test();
+<<<<<<< HEAD
     let kill = get_kill_test();
+=======
+>>>>>>> main
     let fd_control = get_fd_control_test();
 
     tm.add_test_group(Box::new(cl));
@@ -161,7 +164,10 @@ fn main() -> Result<()> {
     tm.add_test_group(Box::new(process_rlimits_fail));
     tm.add_test_group(Box::new(no_pivot));
     tm.add_test_group(Box::new(process_oom_score_adj));
+<<<<<<< HEAD
     tm.add_test_group(Box::new(kill));
+=======
+>>>>>>> main
     tm.add_test_group(Box::new(fd_control));
 
     tm.add_test_group(Box::new(io_priority_test));