mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-10-03 12:18:10 +00:00
bc0ed23a5d
Services started by nxinit (e.g. "sh") do not open a console device on their own, unlike nsh_main, which explicitly does so via nsh_consolemain()/nsh_waitusbready() for USB gadget consoles (CDC-ACM/PL2303). When such a board switches its top-level init from nsh_main to nxinit, no code path ever registers/connects the USB console gadget, and a service that just execs a plain "sh" inherits whatever (invalid, for a USB gadget console not yet opened at the time the idle task file descriptors are set up) stdio nxinit itself has. Add a "console [<device>]" service option: a service declared with it gets the given device (CONFIG_SYSTEM_NXINIT_CONSOLE_DEV, "/dev/console" by default, if no device is given) opened and dup'd onto its stdin, stdout and stderr via posix_spawn_file_actions before it is spawned. This does not depend on nsh being enabled at all. For a USB gadget console, the device does not exist until the gadget is actually registered; boards using one are expected to bring it up themselves before any service using "console" is started (e.g. via an "exec -- sercon" action in their init.rc, since apps/system/cdcacm already implements exactly that registration step and does not depend on nxinit or nsh either). console_file_actions() runs after the previous commit's time_started update, so a failure to build the console's file actions is covered by the same up to date timestamp - no separate clock_gettime() call is needed on this failure path. Covered by a new unit test, test_nxinit_service_console_option, that exercises the option with and without an explicit device, and confirms services without the option are left untouched. Assisted-by: Kiro:claude-sonnet-5 Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
66 lines
2.9 KiB
C
66 lines
2.9 KiB
C
/****************************************************************************
|
|
* apps/system/nxinit/test/test_nxinit.c
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <setjmp.h>
|
|
#include <stdarg.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include <cmocka.h>
|
|
|
|
#include "test_nxinit.h"
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
int main(int argc, FAR char *argv[])
|
|
{
|
|
const struct CMUnitTest nxinit_tests[] =
|
|
{
|
|
cmocka_unit_test(test_nxinit_parser_arguments_spaces),
|
|
cmocka_unit_test(test_nxinit_parser_arguments_quoted),
|
|
cmocka_unit_test(test_nxinit_parser_arguments_dashdash_separator),
|
|
cmocka_unit_test(test_nxinit_parser_arguments_long_option),
|
|
cmocka_unit_test(test_nxinit_parser_arguments_truncate),
|
|
cmocka_unit_test(test_nxinit_parser_config_sections),
|
|
cmocka_unit_test(test_nxinit_parser_config_skip_blank_lines),
|
|
cmocka_unit_test(test_nxinit_parser_config_unknown_section),
|
|
cmocka_unit_test(test_nxinit_parser_config_line_too_long),
|
|
cmocka_unit_test(test_nxinit_parser_config_line_crosses_boundary),
|
|
cmocka_unit_test(test_nxinit_parser_config_buffer_crosses_boundary),
|
|
cmocka_unit_test(test_nxinit_action_event_match_exact),
|
|
cmocka_unit_test(test_nxinit_action_event_match_invert),
|
|
cmocka_unit_test(test_nxinit_action_event_match_fnmatch),
|
|
cmocka_unit_test(test_nxinit_action_event_and_semantics),
|
|
cmocka_unit_test(test_nxinit_service_duplicate_conflict),
|
|
cmocka_unit_test(test_nxinit_service_override_replaces_duplicate),
|
|
cmocka_unit_test(test_nxinit_service_args_max_boundary),
|
|
cmocka_unit_test(test_nxinit_service_console_option),
|
|
};
|
|
|
|
return cmocka_run_group_tests(nxinit_tests, test_nxinit_group_setup,
|
|
test_nxinit_group_teardown);
|
|
}
|