Skip to content

add test and fix an issue #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ComixHe merged 3 commits into from
Dec 31, 2025
Merged

add test and fix an issue #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8c8109
test: add console-size test
ComixHe Dec 31, 2025
ea886ae
refactor: resolving compile warnings
ComixHe Dec 31, 2025
0b6e68e
fix: correct console size during setup
ComixHe Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/linyaps_box/container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,7 +1665,7 @@ void configure_terminal(const linyaps_box::container &container,
}

if (process.console_size) {
slave.set_size({ process.console_size->height, process.console_size->height, 0, 0 });
slave.set_size({ process.console_size->height, process.console_size->width, 0, 0 });
}

auto root = linyaps_box::utils::open("/", O_PATH | O_CLOEXEC | O_DIRECTORY);
Expand Down
2 changes: 1 addition & 1 deletion src/linyaps_box/io/forwarder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ auto Forwarder::set_src(const utils::file_descriptor &src) -> void
auto Forwarder::set_dst(const utils::file_descriptor &dst) -> void
{
dst_.fd = &dst;
const auto ev = EPOLLET;
const uint32_t ev = EPOLLET;

dst_.pollable = poller.get().add(*dst_.fd, ev);
dst_.last_events = dst_.pollable ? ev : 0;
Expand Down
4 changes: 2 additions & 2 deletions src/linyaps_box/terminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ auto terminal_master::resize(struct winsize size) -> void
}

terminal_slave::terminal_slave(terminal_slave &&other) noexcept
: termios(std::exchange(other.termios, std::nullopt))
, slave_(std::move(other.slave_))
: slave_(std::move(other.slave_))
, termios(std::exchange(other.termios, std::nullopt))
{
}

Expand Down
31 changes: 31 additions & 0 deletions tests/ll-box-st/14-console-size.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "Change terminal size",
"process": {
"user": {
"uid": 0,
"gid": 0
},
"args": ["stty", "size"],
"env": [
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"TERM=xterm",
"HOME=/root"
],
"cwd": "/",
"terminal": true,
"consoleSize": {
"height": 24,
"width": 80
}
},
"linux": {
"readonlyPaths": [
"/proc/asound",
"/proc/bus",
"/proc/fs",
"/proc/irq",
"/proc/sysrq-trigger"
]
},
"expected": "24 80"
}
3 changes: 2 additions & 1 deletion tests/ll-box-st/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ set(linyaps-box_SMOKE_TESTS
./10-check-oom.json
./11-output-to-null.json
./12-bind-host-dev.json
./13-pid-extension.json)
./13-pid-extension.json
./14-console-size.json)

foreach(test ${linyaps-box_SMOKE_TESTS})
add_test(
Expand Down
2 changes: 1 addition & 1 deletion tests/ll-box-st/ll-box-st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ function run_test() {
log "[INFO] ==== COMMAND OUTPUT START ===="
local REAL
REAL="$(
LINYAPS_BOX_LOG_FORCE_STDERR=1 "${TEST_COMMAND[@]}" </dev/null | tr -d '\r' && :
LINYAPS_BOX_LOG_LEVEL=6 LINYAPS_BOX_LOG_FORCE_STDERR=1 "${TEST_COMMAND[@]}" </dev/null | tr -d '\r' && :
)" && :
EXIT_CODE=$?
log "[INFO] ==== COMMAND OUTPUT END ======"
Expand Down