meswork/wasm-simulator
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

继续按 align-linuxcnc 约束：补 M 码和刀具 native 覆盖，测试通过

Browse Source 
结论：补齐 LinuxCNC interp_convert.cc convert_m()、convert_tool_select()、convert_tool_length_offset() 以及 interp_find.cc find_tool_index() 相关错误 fixture 的 native 校验；./test-native.sh 与 ./test-linuxcnc-source-link.sh 均通过，未扩展 smoke。
This commit is contained in:
cnc
2026-06-02 23:42:05 +08:00
parent ba526a6042
commit ad3720713e
2 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
test-linuxcnc-rs274-native.sh
View File

@@ -136,6 +136,43 @@ CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linux
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_spindle_modes.ngc >"$output_dir/cnc_sim_linuxcnc_spindle_modes.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_spindle_orient.ngc >"$output_dir/cnc_sim_linuxcnc_spindle_orient.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_io_controls.ngc >"$output_dir/cnc_sim_linuxcnc_io_controls.json"
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc convert_m()
# validates M62-M68 input/output words, M3/M4/M5/M19 spindle selectors, M61 Q
# tool numbers, and M19 Q wait values before issuing Canon output/input, tool,
# or spindle-orient calls. LinuxCNC src/emc/rs274ngc/interp_check.cc
# check_other_codes() validates M19 P/R words before conversion.
convert_m_error_cases=(
"linuxcnc_m3_spindle_dollar_out_of_range_error|Spindle (\$) number out of range in M3 Command"
"linuxcnc_m4_spindle_dollar_out_of_range_error|Spindle (\$) number out of range in M4 Command"
"linuxcnc_m5_spindle_dollar_out_of_range_error|Spindle (\$) number out of range in M5 Command"
"linuxcnc_m62_missing_p_word_error|No valid P word with M62"
"linuxcnc_m63_missing_p_word_error|No valid P word with M63"
"linuxcnc_m64_missing_p_word_error|No valid P word with M64"
"linuxcnc_m65_missing_p_word_error|No valid P word with M65"
"linuxcnc_m66_missing_input_error|Need to have either a valid P or a valid E word with M66"
"linuxcnc_m66_both_inputs_error|Invalid to select both a digital and an analog input with M66"
"linuxcnc_m66_zero_timeout_error|Zero timeout with wait type != immediate return"
"linuxcnc_m66_analog_wait_error|Can't select analog input with wait type != immediate return"
"linuxcnc_m67_missing_e_word_error|Invalid analog index with M67"
"linuxcnc_m68_missing_e_word_error|Invalid analog index with M68"
"linuxcnc_m19_spindle_dollar_out_of_range_error|Spindle (\$) number out of range in M19 Command"
"linuxcnc_m19_p_not_integer_error|P value not an integer with M19 G2 or G3"
"linuxcnc_m19_p_out_of_range_error|P value must be 0,1,or 2 with M19"
"linuxcnc_m19_r_out_of_range_error|R value must be within 0..360 with M19"
"linuxcnc_m19_zero_q_error|Q word with M19 requires a value > 0"
"linuxcnc_m61_negative_q_error|Need non-negative Q-word to specify tool number with M61"
)
for case in "${convert_m_error_cases[@]}"; do
fixture=${case%%|*}
expected=${case#*|}
if CNC_SIM_RS274_VAR="$var_file" \
"$build_dir/linuxcnc_rs274_dump" "tests/gcode/$fixture.ngc" \
>"$output_dir/cnc_sim_linuxcnc_$fixture.json" 2>"$output_dir/cnc_sim_linuxcnc_$fixture.err"; then
echo "expected $fixture.ngc to fail" >&2
exit 1
fi
grep -Fq "$expected" "$output_dir/cnc_sim_linuxcnc_$fixture.err"
done
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_override_controls.ngc >"$output_dir/cnc_sim_linuxcnc_override_controls.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_modal_state.ngc >"$output_dir/cnc_sim_linuxcnc_modal_state.json"
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_modal_autorestore.ngc >"$output_dir/cnc_sim_linuxcnc_modal_autorestore.json"
@@ -344,12 +381,51 @@ CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linux
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_lathe_diameter_mode.ngc >"$output_dir/cnc_sim_linuxcnc_lathe_diameter_mode.json"
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_lathe_diameter_g76.ngc >"$output_dir/cnc_sim_linuxcnc_lathe_diameter_g76.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_tool_number.ngc >"$output_dir/cnc_sim_linuxcnc_tool_number.json"
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc
# convert_tool_select() and convert_m() M61 both route through
# src/emc/rs274ngc/interp_find.cc find_tool_index() for tooldata lookup.
tool_number_error_cases=(
"linuxcnc_t_missing_tool_error|Requested tool 99 not found in the tool table"
"linuxcnc_m61_missing_tool_error|Requested tool 99 not found in the tool table"
)
for case in "${tool_number_error_cases[@]}"; do
fixture=${case%%|*}
expected=${case#*|}
if CNC_SIM_RS274_VAR="$var_file" \
"$build_dir/linuxcnc_rs274_dump" "tests/gcode/$fixture.ngc" \
>"$output_dir/cnc_sim_linuxcnc_$fixture.json" 2>"$output_dir/cnc_sim_linuxcnc_$fixture.err"; then
echo "expected $fixture.ngc to fail" >&2
exit 1
fi
grep -Fq "$expected" "$output_dir/cnc_sim_linuxcnc_$fixture.err"
done
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_program_stops.ngc >"$output_dir/cnc_sim_linuxcnc_program_stops.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_coolant.ngc >"$output_dir/cnc_sim_linuxcnc_coolant.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_feed_modes.ngc >"$output_dir/cnc_sim_linuxcnc_feed_modes.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_motion_modes.ngc >"$output_dir/cnc_sim_linuxcnc_motion_modes.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_tool_length.ngc >"$output_dir/cnc_sim_linuxcnc_tool_length.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_dynamic_tool_length.ngc >"$output_dir/cnc_sim_linuxcnc_dynamic_tool_length.json"
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc
# convert_tool_length_offset() rejects invalid G43.2 H/axis combinations,
# and src/emc/rs274ngc/interp_find.cc find_tool_index() rejects H tool
# numbers missing from the LinuxCNC tooldata table.
tool_length_offset_error_cases=(
"linuxcnc_g43_missing_tool_error|Requested tool 99 not found in the tool table"
"linuxcnc_g43_2_missing_tool_error|Requested tool 99 not found in the tool table"
"linuxcnc_g43_2_h_axis_error|G43.2: Can not have both H and axis words"
"linuxcnc_g43_2_missing_h_axis_error|G43.2: No axes specified and H word missing"
)
for case in "${tool_length_offset_error_cases[@]}"; do
fixture=${case%%|*}
expected=${case#*|}
if CNC_SIM_RS274_VAR="$var_file" \
"$build_dir/linuxcnc_rs274_dump" "tests/gcode/$fixture.ngc" \
>"$output_dir/cnc_sim_linuxcnc_$fixture.json" 2>"$output_dir/cnc_sim_linuxcnc_$fixture.err"; then
echo "expected $fixture.ngc to fail" >&2
exit 1
fi
grep -Fq "$expected" "$output_dir/cnc_sim_linuxcnc_$fixture.err"
done
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_canned_cycle.ngc >"$output_dir/cnc_sim_linuxcnc_canned_cycle.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_canned_cycles_extended.ngc >"$output_dir/cnc_sim_linuxcnc_canned_cycles_extended.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_canned_cycle_planes.ngc >"$output_dir/cnc_sim_linuxcnc_canned_cycle_planes.json"