github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-04 10:24:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4353 from ManaSugi/runk/enable-agent-unit-tests

Browse Source 
agent, runk: Enable test for the agent built with standard-oci-runtime feature
This commit is contained in:
Bin Liu
2022-06-01 07:39:01 +08:00
committed by GitHub
parent 96c8df40b5 c7b3941c96
commit 9658c6218e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/agent/rustjail/src/console.rs
View File

@@ -58,10 +58,7 @@ pub fn setup_master_console(socket_fd: RawFd) -> Result<()> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::skip_if_not_root;
use std::fs::File;
use std::os::unix::net::UnixListener; use std::os::unix::net::UnixListener;
use std::path::PathBuf;
use tempfile::{self, tempdir}; use tempfile::{self, tempdir};
const CONSOLE_SOCKET: &str = "console-socket"; const CONSOLE_SOCKET: &str = "console-socket";

8
src/tools/runk/Makefile
View File

@@ -7,6 +7,7 @@ include ../../../utils.mk
TARGET = runk TARGET = runk
TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET) TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
AGENT_SOURCE_PATH = ../../agent
# BINDIR is a directory for installing executable programs # BINDIR is a directory for installing executable programs
BINDIR := /usr/local/bin BINDIR := /usr/local/bin
@@ -26,9 +27,14 @@ clean:
vendor: vendor:
cargo vendor cargo vendor
test: test: test-runk test-agent
test-runk:
cargo test --all --target $(TRIPLE) -- --nocapture cargo test --all --target $(TRIPLE) -- --nocapture
test-agent:
make test -C $(AGENT_SOURCE_PATH) STANDARD_OCI_RUNTIME=yes
check: standard_rust_check check: standard_rust_check
.PHONY: \ .PHONY: \