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

继续按 align-linuxcnc 约束：补固定循环 native 覆盖，测试通过

Browse Source 
结论：补齐 LinuxCNC interp_cycles.cc 固定循环错误 fixture 的 native 校验，覆盖重复次数、平面轴/R、Q/P、主轴状态和 G87 必需字；./test-native.sh 与 ./test-linuxcnc-source-link.sh 均通过，未扩展 smoke。
This commit is contained in:
cnc
2026-06-02 23:47:02 +08:00
parent ad3720713e
commit 55c75ffe80
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,6 +427,53 @@ for case in "${tool_length_offset_error_cases[@]}"; do
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"
# Source basis: LinuxCNC src/emc/rs274ngc/interp_cycles.cc
# convert_cycle() and the G73/G74/G82-G89 helpers validate canned-cycle
# repeat counts, plane-specific axis/R words, Q/P requirements, and spindle
# state before expanding cycles to Canon motion.
canned_cycle_error_cases=(
"linuxcnc_canned_cycle_l0_error|Cannot do zero repeats of cycle"
"linuxcnc_canned_cycle_missing_r_error|R clearance plane unspecified in cycle"
"linuxcnc_canned_cycle_missing_z_error|Z value unspecified in xy plane canned cycle"
"linuxcnc_canned_cycle_g18_missing_y_error|Y value unspecified in xz plane canned cycle"
"linuxcnc_canned_cycle_g19_missing_x_error|X value unspecified in yz plane canned cycle"
"linuxcnc_canned_cycle_r_less_z_error|R less than z in cycle in xy plane"
"linuxcnc_canned_cycle_g18_r_less_y_error|R less than y in cycle in xz plane"
"linuxcnc_canned_cycle_g19_r_less_x_error|R less than x in cycle in yz plane"
"linuxcnc_canned_cycle_u_in_xy_error|Cannot put a U in a canned cycle in the XY plane"
"linuxcnc_canned_cycle_a_error|Cannot put an a in canned cycle"
"linuxcnc_canned_cycle_b_error|Cannot put a b in canned cycle"
"linuxcnc_canned_cycle_c_error|Cannot put a c in canned cycle"
"linuxcnc_canned_cycle_g73_missing_q_error|Q word missing with g73"
"linuxcnc_canned_cycle_g83_missing_q_error|Q word missing with g83"
"linuxcnc_canned_cycle_g73_q0_error|Negative or zero q value used"
"linuxcnc_canned_cycle_g83_q0_error|Negative or zero q value used"
"linuxcnc_canned_cycle_g82_missing_p_error|Dwell time p word missing with g82"
"linuxcnc_canned_cycle_g86_missing_p_error|Dwell time p word missing with g86"
"linuxcnc_canned_cycle_g88_missing_p_error|Dwell time p word missing with g88"
"linuxcnc_canned_cycle_g89_missing_p_error|Dwell time p word missing with g89"
"linuxcnc_canned_cycle_g74_clockwise_error|Spindle turning clockwise in G74"
"linuxcnc_canned_cycle_g84_counterclockwise_error|Spindle turning counterclockwise in G84"
"linuxcnc_canned_cycle_g74_stopped_spindle_error|Spindle not turning in G74"
"linuxcnc_canned_cycle_g84_stopped_spindle_error|Spindle not turning in G84"
"linuxcnc_canned_cycle_g86_stopped_spindle_error|Spindle not turning in g86"
"linuxcnc_canned_cycle_g88_stopped_spindle_error|Spindle not turning in g88"
"linuxcnc_canned_cycle_g87_stopped_spindle_error|Spindle not turning in g87"
"linuxcnc_canned_cycle_g87_missing_k_error|K word missing with g87"
"linuxcnc_canned_cycle_g87_missing_i_error|I word missing with g87"
"linuxcnc_canned_cycle_g87_missing_j_error|J word missing with g87"
)
for case in "${canned_cycle_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_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"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_arc_planes.ngc >"$output_dir/cnc_sim_linuxcnc_arc_planes.json"