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

继续按 align-linuxcnc 约束：补轴运动 native 覆盖，测试通过

Browse Source 
结论：补齐 LinuxCNC interp_internal.cc enhance_block() 轴/运动错误 fixture 的 native 校验，并同步 check_other_codes() native 覆盖文档；./test-native.sh 与 ./test-linuxcnc-source-link.sh 均通过。
This commit is contained in:
cnc
2026-06-02 23:34:56 +08:00
parent 93f2a903b5
commit ba526a6042
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,29 @@ if CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/li
echo "expected linuxcnc_modal_invalidate.ngc to fail" >&2
exit 1
fi
# Source basis: LinuxCNC src/emc/rs274ngc/interp_internal.cc
# enhance_block() assigns motion_to_be and rejects invalid axis use with G80,
# missing axes for G52/G92 or motion codes, bare axis words without active
# motion, and modal-0 G codes that consume axis values on a motion block.
enhance_block_error_cases=(
"linuxcnc_g80_axis_error|Cannot use axis values with g80"
"linuxcnc_g52_missing_axis_error|All axes missing with g52 or g92"
"linuxcnc_g92_missing_axis_error|All axes missing with g52 or g92"
"linuxcnc_motion_missing_axis_error|All axes missing with motion code"
"linuxcnc_axis_without_motion_error|Cannot use axis values without a g code that uses them"
"linuxcnc_motion_with_g92_axis_error|Cannot use two g codes that both use axis values"
)
for case in "${enhance_block_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
# Source basis: LinuxCNC src/emc/rs274ngc/interp_check.cc
# check_g_codes() rejects invalid modal-0 combinations for G4, G10, and G53
# before convert_g() executes motion or coordinate updates.
@@ -287,6 +310,31 @@ for case in "${unused_word_error_cases[@]}"; do
fi
grep -Fq "$expected" "$output_dir/cnc_sim_linuxcnc_$fixture.err"
done
# Source basis: LinuxCNC src/emc/rs274ngc/interp_check.cc
# check_other_codes() enforces required and disallowed words for G96,
# G33/G33.1, and G76 before motion conversion.
threading_check_error_cases=(
"linuxcnc_g96_missing_s_word_error|S word missing with G96"
"linuxcnc_g33_missing_k_word_error|K word missing with g33/g33.1"
"linuxcnc_g33_f_word_error|F word used with a g33/g33.1"
"linuxcnc_g33_1_missing_k_word_error|K word missing with g33/g33.1"
"linuxcnc_g33_1_f_word_error|F word used with a g33/g33.1"
"linuxcnc_g76_missing_p_word_error|P word missing with G76"
"linuxcnc_g76_missing_i_word_error|I J or K words missing with G76"
"linuxcnc_g76_missing_j_word_error|I J or K words missing with G76"
"linuxcnc_g76_missing_k_word_error|I J or K words missing with G76"
)
for case in "${threading_check_error_cases[@]}"; do
fixture=${case%%|*}
expected=${case#*|}
if CNC_SIM_RS274_FILE_MODE=1 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_threading_sync.ngc >"$output_dir/cnc_sim_linuxcnc_threading_sync.json"
CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_threading_cycle.ngc >"$output_dir/cnc_sim_linuxcnc_threading_cycle.json"
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc