参考所有分组,完成尽量多的内容。禁止顺手扩功能 smoke

结论:补齐 check-linuxcnc-inputs-cached.sh 的 cache-dir 入口拒绝守卫,锁住缺失 cache-dir 值和空白预检缓存目录,不新增 CNC 行为或 smoke 功能。
This commit is contained in:
cnc
2026-06-03 20:57:15 +08:00
parent d7b9006ba5
commit aaa2573bba

View File

@@ -39,6 +39,8 @@ missing_source_manifest=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_native_syntax_missing_
missing_source_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_native_syntax_missing_source.XXXXXX.log") missing_source_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_native_syntax_missing_source.XXXXXX.log")
kinematics_unknown_filter_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_kinematics_manifest_unknown_filter.XXXXXX.log") kinematics_unknown_filter_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_kinematics_manifest_unknown_filter.XXXXXX.log")
kinematics_unknown_output_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_kinematics_manifest_unknown_output.XXXXXX.log") kinematics_unknown_output_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_kinematics_manifest_unknown_output.XXXXXX.log")
inputs_cached_missing_cache_dir_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_inputs_cached_missing_cache_dir.XXXXXX.log")
inputs_cached_whitespace_cache_dir_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_inputs_cached_whitespace_cache_dir.XXXXXX.log")
switchkins_checker_unknown_option_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_switchkins_checker_unknown_option.XXXXXX.log") switchkins_checker_unknown_option_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_switchkins_checker_unknown_option.XXXXXX.log")
switchkins_checker_too_many_args_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_switchkins_checker_too_many_args.XXXXXX.log") switchkins_checker_too_many_args_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_switchkins_checker_too_many_args.XXXXXX.log")
switchkins_cached_missing_cache_dir_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_switchkins_cached_missing_cache_dir.XXXXXX.log") switchkins_cached_missing_cache_dir_log=$(mktemp "${TMPDIR:-/tmp}/cnc_sim_switchkins_cached_missing_cache_dir.XXXXXX.log")
@@ -95,6 +97,8 @@ cleanup_native_test_temps() {
"$missing_source_log" \ "$missing_source_log" \
"$kinematics_unknown_filter_log" \ "$kinematics_unknown_filter_log" \
"$kinematics_unknown_output_log" \ "$kinematics_unknown_output_log" \
"$inputs_cached_missing_cache_dir_log" \
"$inputs_cached_whitespace_cache_dir_log" \
"$switchkins_checker_unknown_option_log" \ "$switchkins_checker_unknown_option_log" \
"$switchkins_checker_too_many_args_log" \ "$switchkins_checker_too_many_args_log" \
"$switchkins_cached_missing_cache_dir_log" \ "$switchkins_cached_missing_cache_dir_log" \
@@ -248,6 +252,8 @@ for forbidden_manual_cleanup in \
'rm -f "$missing_source_manifest" "$missing_source_log"' \ 'rm -f "$missing_source_manifest" "$missing_source_log"' \
'rm -f "$kinematics_unknown_filter_log"' \ 'rm -f "$kinematics_unknown_filter_log"' \
'rm -f "$kinematics_unknown_output_log"' \ 'rm -f "$kinematics_unknown_output_log"' \
'rm -f "$inputs_cached_missing_cache_dir_log"' \
'rm -f "$inputs_cached_whitespace_cache_dir_log"' \
'rm -f "$switchkins_checker_unknown_option_log"' \ 'rm -f "$switchkins_checker_unknown_option_log"' \
'rm -f "$switchkins_checker_too_many_args_log"' \ 'rm -f "$switchkins_checker_too_many_args_log"' \
'rm -f "$switchkins_cached_missing_cache_dir_log"' \ 'rm -f "$switchkins_cached_missing_cache_dir_log"' \
@@ -1382,6 +1388,26 @@ if ! grep -F "too many switchkins remap table checker arguments" "$switchkins_ch
sed -n '1,20p' "$switchkins_checker_too_many_args_log" >&2 sed -n '1,20p' "$switchkins_checker_too_many_args_log" >&2
exit 1 exit 1
fi fi
if ./check-linuxcnc-inputs-cached.sh --cache-dir >"$inputs_cached_missing_cache_dir_log" 2>&1; then
echo "cached LinuxCNC input checker accepted --cache-dir without a value" >&2
exit 1
fi
if ! grep -F "missing --cache-dir value" "$inputs_cached_missing_cache_dir_log" >/dev/null; then
echo "cached LinuxCNC input checker did not report missing cache-dir values clearly" >&2
sed -n '1,20p' "$inputs_cached_missing_cache_dir_log" >&2
exit 1
fi
if ./check-linuxcnc-inputs-cached.sh --cache-dir "build/input cache" \
linuxcnc-rs274-source-files.txt >"$inputs_cached_whitespace_cache_dir_log" 2>&1; then
echo "cached LinuxCNC input checker accepted whitespace in cache dir" >&2
exit 1
fi
if ! grep -F "CNC_SIM_PREFLIGHT_CACHE_DIR must not contain whitespace: build/input cache" \
"$inputs_cached_whitespace_cache_dir_log" >/dev/null; then
echo "cached LinuxCNC input checker did not report whitespace cache dirs clearly" >&2
sed -n '1,20p' "$inputs_cached_whitespace_cache_dir_log" >&2
exit 1
fi
if ./check-linuxcnc-switchkins-remap-table-cached.sh --cache-dir >"$switchkins_cached_missing_cache_dir_log" 2>&1; then if ./check-linuxcnc-switchkins-remap-table-cached.sh --cache-dir >"$switchkins_cached_missing_cache_dir_log" 2>&1; then
echo "cached switchkins remap table checker accepted --cache-dir without a value" >&2 echo "cached switchkins remap table checker accepted --cache-dir without a value" >&2
exit 1 exit 1