refactor: replace function_runner cfg gates with test_utils in cairo_test_suite

Also fix duplicate and stale CHANGELOG entries for PRs #2377-#2379.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: naor-starkware

CHANGELOG.md

@@ -13,8 +13,11 @@ Both branches support Stwo prover opcodes (Blake2s, QM31) since v2.0.0.
 #### Upcoming Changes
 * feat: add `test_helpers` module (`error_utils`, `test_utils`) with `assert_mr_eq!`, `load_cairo_program!` macros and `expect_*` error checkers, behind `test_utils` feature flag [#2381](https://github.com/starkware-libs/cairo-vm/pull/2381)
 
+* refactor: add `CairoFunctionRunner` type alias for `CairoRunner` under the `test_utils` feature flag [#2377](https://github.com/starkware-libs/cairo-vm/pull/2377)
+* feat: add `test_helpers` module (`error_utils`, `test_utils`) with `assert_mr_eq!`, `load_cairo_program!` macros and `expect_*` error checkers, behind `test_utils` feature flag [#2378](https://github.com/starkware-libs/cairo-vm/pull/2378)
+
 * feat(makefile,ci): add `cairo_test_suite_programs` Makefile target and CI integration to compile Cairo test suite programs before running tests [#2380](https://github.com/starkware-libs/cairo-vm/pull/2380)
-* feat: add math Cairo test suite under `vm/src/tests/cairo_test_suite` using the `function_runner` feature flag [#2379](https://github.com/starkware-libs/cairo-vm/pull/2379)
+* feat: add math Cairo test suite under `vm/src/tests/cairo_test_suite` using the `test_utils` feature flag [#2379](https://github.com/starkware-libs/cairo-vm/pull/2379)
 
 * Add Stwo cairo runner API [#2351](https://github.com/lambdaclass/cairo-vm/pull/2351)
 

vm/src/tests/cairo_test_suite/mod.rs

@@ -1,2 +1,2 @@
-#[cfg(feature = "function_runner")]
+#[cfg(feature = "test_utils")]
 mod test_math;

vm/src/tests/mod.rs

@@ -36,7 +36,7 @@ mod cairo_pie_test;
 #[cfg(feature = "test_utils")]
 mod skip_instruction_test;
 
-#[cfg(feature = "function_runner")]
+#[cfg(feature = "test_utils")]
 mod cairo_test_suite;
 
 //For simple programs that should just succeed and have no special needs.