# # # patch "roster.cc" # from [c28f199c9e85fccf5714d2348389d9c4997ac2bc] # to [937c4c0c365de925e50123ad3edaa4cc833d6f49] # ============================================================ --- roster.cc c28f199c9e85fccf5714d2348389d9c4997ac2bc +++ roster.cc 937c4c0c365de925e50123ad3edaa4cc833d6f49 @@ -3361,12 +3361,12 @@ } static void -run_a_2_scalar_parent_scenario(scalar_val left_val, - std::set const & left_mark_set, - scalar_val right_val, - std::set const & right_mark_set, - scalar_val new_val, - std::set const & new_mark_set) +run_a_2_scalar_parent_scenario_exact(scalar_val left_val, + std::set const & left_mark_set, + scalar_val right_val, + std::set const & right_mark_set, + scalar_val new_val, + std::set const & new_mark_set) { testing_node_id_source nis; scalars ss = all_scalars(nis); @@ -3380,6 +3380,24 @@ } } +static void +run_a_2_scalar_parent_scenario(scalar_val left_val, + std::set const & left_mark_set, + scalar_val right_val, + std::set const & right_mark_set, + scalar_val new_val, + std::set const & new_mark_set) +{ + // run both what we're given... + run_a_2_scalar_parent_scenario_exact(left_val, left_mark_set, + right_val, right_mark_set, + new_val, new_mark_set); + // ...and its symmetric reflection + run_a_2_scalar_parent_scenario_exact(right_val, right_mark_set, + left_val, left_mark_set, + new_val, new_mark_set); +} + //////////////// // These functions contain the actual list of *-merge cases that we would like // to test.