参考所有分组：补 native 参数持久化和 threading 覆盖，测试通过
This commit is contained in:
cnc
@@ -451,6 +451,33 @@ for case in "${threading_check_error_cases[@]}"; do
|
||||
fi
|
||||
grep -Fq "$expected" "$output_dir/cnc_sim_linuxcnc_$fixture.err"
|
||||
done
|
||||
# Source basis: LinuxCNC src/emc/rs274ngc/interp_convert.cc
|
||||
# convert_straight() and convert_threading_cycle() reject invalid
|
||||
# spindle state/selector, rotary-axis motion, and G76 I/J/K geometry
|
||||
# before issuing synchronized threading motion.
|
||||
threading_convert_error_cases=(
|
||||
"linuxcnc_g33_stopped_spindle_error|Spindle not turning in G33"
|
||||
"linuxcnc_g33_1_stopped_spindle_error|Spindle not turning in G33.1"
|
||||
"linuxcnc_g33_spindle_dollar_out_of_range_error|Invalid spindle (\$) number in G33 move"
|
||||
"linuxcnc_g33_1_spindle_dollar_out_of_range_error|Invalid spindle (\$) number in G33.1 move"
|
||||
"linuxcnc_g76_spindle_dollar_out_of_range_error|Invalid D-number in G76 cycle"
|
||||
"linuxcnc_g76_stopped_spindle_error|Chosen spindle (0) not turning in G76"
|
||||
"linuxcnc_g76_rotary_axis_error|Cannot move rotary axes with G76"
|
||||
"linuxcnc_g76_i_zero_error|In G76, I must not be 0"
|
||||
"linuxcnc_g76_j_zero_error|In G76, J must be greater than 0"
|
||||
"linuxcnc_g76_k_less_equal_j_error|In G76, K must be greater than J"
|
||||
)
|
||||
for case in "${threading_convert_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
|
||||
@@ -787,6 +814,34 @@ CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs2
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_rotary_tool_offset_numbered_parameters.ngc >"$output_dir/cnc_sim_linuxcnc_rotary_tool_offset_numbered_parameters.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_current_position_numbered_parameters.ngc >"$output_dir/cnc_sim_linuxcnc_current_position_numbered_parameters.json"
|
||||
cp "$base_var_file" "$var_file"
|
||||
# Source basis: LinuxCNC src/emc/rs274ngc/rs274ngc_pre.cc
|
||||
# restore_parameters() loads only persisted system/user parameters and
|
||||
# save_parameters() writes required and changed persistent ranges.
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_persistent_parameters_set.ngc >"$output_dir/cnc_sim_linuxcnc_persistent_parameters_set.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_persistent_parameters_check.ngc >"$output_dir/cnc_sim_linuxcnc_persistent_parameters_check.json"
|
||||
rotary_persistent_var_file="$build_dir/rs274ngc-rotary-persistent.var"
|
||||
: > "$rotary_persistent_var_file"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$rotary_persistent_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_rotary_persistent_parameters_set.ngc >"$output_dir/cnc_sim_linuxcnc_rotary_persistent_parameters_set.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$rotary_persistent_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_rotary_persistent_parameters_check.ngc >"$output_dir/cnc_sim_linuxcnc_rotary_persistent_parameters_check.json"
|
||||
g54_persistent_var_file="$build_dir/rs274ngc-g54-persistent.var"
|
||||
: > "$g54_persistent_var_file"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$g54_persistent_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_g54_persistent_parameters_set.ngc >"$output_dir/cnc_sim_linuxcnc_g54_persistent_parameters_set.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$g54_persistent_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_g54_persistent_parameters_check.ngc >"$output_dir/cnc_sim_linuxcnc_g54_persistent_parameters_check.json"
|
||||
empty_var_file="$build_dir/rs274ngc-empty.var"
|
||||
: > "$empty_var_file"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$empty_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_user_persistent_parameter_set.ngc >"$output_dir/cnc_sim_linuxcnc_user_persistent_parameter_set.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$empty_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_user_persistent_parameter_check.ngc >"$output_dir/cnc_sim_linuxcnc_user_persistent_parameter_check.json"
|
||||
existing_user_var_file="$build_dir/rs274ngc-existing-user.var"
|
||||
printf '5001\t17.000000\n' > "$existing_user_var_file"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$existing_user_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_user_persistent_parameter_set.ngc >"$output_dir/cnc_sim_linuxcnc_user_existing_persistent_parameter_set.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$existing_user_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_user_persistent_parameter_existing_check.ngc >"$output_dir/cnc_sim_linuxcnc_user_existing_persistent_parameter_check.json"
|
||||
boundary_user_var_file="$build_dir/rs274ngc-boundary-user.var"
|
||||
printf '5001\t17.000000\n5030\t18.000000\n5060\t19.000000\n' > "$boundary_user_var_file"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$boundary_user_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_user_persistent_parameter_boundary_set.ngc >"$output_dir/cnc_sim_linuxcnc_user_persistent_parameter_boundary_set.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$boundary_user_var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_user_persistent_parameter_boundary_check.ngc >"$output_dir/cnc_sim_linuxcnc_user_persistent_parameter_boundary_check.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_volatile_global_parameter_set.ngc >"$output_dir/cnc_sim_linuxcnc_volatile_global_parameter_set.json"
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" "$build_dir/linuxcnc_rs274_dump" tests/gcode/linuxcnc_volatile_global_parameter_check.ngc >"$output_dir/cnc_sim_linuxcnc_volatile_global_parameter_check.json"
|
||||
cp "$base_var_file" "$var_file"
|
||||
# Source basis: LinuxCNC src/emc/rs274ngc/interp_read.cc
|
||||
# read_parameter_setting(), read_parameter(), read_real_value(),
|
||||
# read_atan(), read_unary(), and read_operation() reject malformed
|
||||
@@ -2369,6 +2424,69 @@ if not any(
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC numbered current-position parameter branch motion")
|
||||
|
||||
persistent_parameters_check = load("cnc_sim_linuxcnc_persistent_parameters_check.json")
|
||||
if not any(
|
||||
event["type"] == "linear-feed" and
|
||||
event["line"] == 5 and
|
||||
event["end"]["x"] == 1
|
||||
for event in persistent_parameters_check
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC persistent parameter reload branch motion")
|
||||
|
||||
rotary_persistent_parameters_check = load("cnc_sim_linuxcnc_rotary_persistent_parameters_check.json")
|
||||
if not any(
|
||||
event["type"] == "linear-feed" and
|
||||
event["line"] == 5 and
|
||||
event["end"]["x"] == 1
|
||||
for event in rotary_persistent_parameters_check
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC rotary persistent parameter reload branch motion")
|
||||
|
||||
g54_persistent_parameters_check = load("cnc_sim_linuxcnc_g54_persistent_parameters_check.json")
|
||||
if not any(
|
||||
event["type"] == "linear-feed" and
|
||||
event["line"] == 4 and
|
||||
event["end"]["x"] == 1
|
||||
for event in g54_persistent_parameters_check
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC G54 persistent parameter reload branch motion")
|
||||
|
||||
user_persistent_parameter_check = load("cnc_sim_linuxcnc_user_persistent_parameter_check.json")
|
||||
if not any(
|
||||
event["type"] == "linear-feed" and
|
||||
event["line"] == 3 and
|
||||
event["end"]["x"] == 1
|
||||
for event in user_persistent_parameter_check
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC empty-var #5001 non-persistence branch motion")
|
||||
|
||||
user_existing_persistent_parameter_check = load("cnc_sim_linuxcnc_user_existing_persistent_parameter_check.json")
|
||||
if not any(
|
||||
event["type"] == "linear-feed" and
|
||||
event["line"] == 3 and
|
||||
event["end"]["x"] == 1
|
||||
for event in user_existing_persistent_parameter_check
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC existing-var #5001 persistence branch motion")
|
||||
|
||||
user_persistent_parameter_boundary_check = load("cnc_sim_linuxcnc_user_persistent_parameter_boundary_check.json")
|
||||
if not any(
|
||||
event["type"] == "linear-feed" and
|
||||
event["line"] == 3 and
|
||||
event["end"]["x"] == 1
|
||||
for event in user_persistent_parameter_boundary_check
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC #5000/#5001/#5030/#5060 persistence boundary branch motion")
|
||||
|
||||
volatile_global_parameter_check = load("cnc_sim_linuxcnc_volatile_global_parameter_check.json")
|
||||
if not any(
|
||||
event["type"] == "linear-feed" and
|
||||
event["line"] == 3 and
|
||||
event["end"]["x"] == 1
|
||||
for event in volatile_global_parameter_check
|
||||
):
|
||||
raise SystemExit("missing LinuxCNC volatile global #31 reset branch motion")
|
||||
|
||||
coords = load("cnc_sim_linuxcnc_coordinate_offsets.json")
|
||||
g5x = [event for event in coords if event["type"] == "set-g5x-offset"]
|
||||
g92 = [event for event in coords if event["type"] == "set-g92-offset"]
|
||||
@@ -2578,6 +2696,20 @@ echo "dumped $output_dir/cnc_sim_linuxcnc_m66_result_parameter.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_tool_offset_numbered_parameters.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_rotary_tool_offset_numbered_parameters.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_current_position_numbered_parameters.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_persistent_parameters_set.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_persistent_parameters_check.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_rotary_persistent_parameters_set.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_rotary_persistent_parameters_check.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_g54_persistent_parameters_set.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_g54_persistent_parameters_check.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_user_persistent_parameter_set.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_user_persistent_parameter_check.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_user_existing_persistent_parameter_set.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_user_existing_persistent_parameter_check.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_user_persistent_parameter_boundary_set.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_user_persistent_parameter_boundary_check.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_volatile_global_parameter_set.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_volatile_global_parameter_check.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_coordinate_offsets.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_coordinate_l20.json"
|
||||
echo "dumped $output_dir/cnc_sim_linuxcnc_coordinate_p0.json"
|
||||
|
||||
Reference in New Issue
Block a user