Add merge slots to Bignum files

Legacy Bignum is excluded as it doesn't get regular extensions like new
ones.

Each slot uses comments of their respective filetype. Since .data files
don't have a syntax for comments, dummy test cases are used. (These test
cases will never be executed and no noise will be added to tests.)

Signed-off-by: Janos Follath <janos.follath@arm.com>
diff --git a/tests/suites/test_suite_bignum_core.function b/tests/suites/test_suite_bignum_core.function
index 745a8af..f50fd07 100644
--- a/tests/suites/test_suite_bignum_core.function
+++ b/tests/suites/test_suite_bignum_core.function
@@ -1045,3 +1045,43 @@
     mbedtls_free( X );
 }
 /* END_CASE */
+
+/* BEGIN MERGE SLOT 1 */
+
+/* END MERGE SLOT 1 */
+
+/* BEGIN MERGE SLOT 2 */
+
+/* END MERGE SLOT 2 */
+
+/* BEGIN MERGE SLOT 3 */
+
+/* END MERGE SLOT 3 */
+
+/* BEGIN MERGE SLOT 4 */
+
+/* END MERGE SLOT 4 */
+
+/* BEGIN MERGE SLOT 5 */
+
+/* END MERGE SLOT 5 */
+
+/* BEGIN MERGE SLOT 6 */
+
+/* END MERGE SLOT 6 */
+
+/* BEGIN MERGE SLOT 7 */
+
+/* END MERGE SLOT 7 */
+
+/* BEGIN MERGE SLOT 8 */
+
+/* END MERGE SLOT 8 */
+
+/* BEGIN MERGE SLOT 9 */
+
+/* END MERGE SLOT 9 */
+
+/* BEGIN MERGE SLOT 10 */
+
+/* END MERGE SLOT 10 */
diff --git a/tests/suites/test_suite_bignum_core.misc.data b/tests/suites/test_suite_bignum_core.misc.data
index 743bb3e..28de243 100644
--- a/tests/suites/test_suite_bignum_core.misc.data
+++ b/tests/suites/test_suite_bignum_core.misc.data
@@ -430,3 +430,83 @@
 
 Fill random core: 42 bytes, 5 missing limbs
 mpi_core_fill_random:42:0:-5:0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA
+
+BEGIN MERGE SLOT 1
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 1
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 2
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 2
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 3
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 3
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 4
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 4
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 5
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 5
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 6
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 6
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 7
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 7
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 8
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 8
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 9
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 9
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+BEGIN MERGE SLOT 10
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
+
+END MERGE SLOT 10
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_core_io_null
diff --git a/tests/suites/test_suite_bignum_mod.data b/tests/suites/test_suite_bignum_mod.data
index cb78140..c80bfa3 100644
--- a/tests/suites/test_suite_bignum_mod.data
+++ b/tests/suites/test_suite_bignum_mod.data
@@ -24,3 +24,83 @@
 
 Test mbedtls_mpi_mod_setup #9 (Both representations valid)
 mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 1
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 1
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 2
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 2
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 3
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 3
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 4
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 4
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 5
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 5
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 6
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 6
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 7
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 7
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 8
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 8
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 9
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 9
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+BEGIN MERGE SLOT 10
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+
+END MERGE SLOT 10
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
diff --git a/tests/suites/test_suite_bignum_mod.function b/tests/suites/test_suite_bignum_mod.function
index ad89bdf..1a2d0c1 100644
--- a/tests/suites/test_suite_bignum_mod.function
+++ b/tests/suites/test_suite_bignum_mod.function
@@ -54,3 +54,43 @@
     #undef MLIMBS
 }
 /* END_CASE */
+
+/* BEGIN MERGE SLOT 1 */
+
+/* END MERGE SLOT 1 */
+
+/* BEGIN MERGE SLOT 2 */
+
+/* END MERGE SLOT 2 */
+
+/* BEGIN MERGE SLOT 3 */
+
+/* END MERGE SLOT 3 */
+
+/* BEGIN MERGE SLOT 4 */
+
+/* END MERGE SLOT 4 */
+
+/* BEGIN MERGE SLOT 5 */
+
+/* END MERGE SLOT 5 */
+
+/* BEGIN MERGE SLOT 6 */
+
+/* END MERGE SLOT 6 */
+
+/* BEGIN MERGE SLOT 7 */
+
+/* END MERGE SLOT 7 */
+
+/* BEGIN MERGE SLOT 8 */
+
+/* END MERGE SLOT 8 */
+
+/* BEGIN MERGE SLOT 9 */
+
+/* END MERGE SLOT 9 */
+
+/* BEGIN MERGE SLOT 10 */
+
+/* END MERGE SLOT 10 */
diff --git a/tests/suites/test_suite_bignum_mod_raw.data b/tests/suites/test_suite_bignum_mod_raw.data
index 788165d..c47d473 100644
--- a/tests/suites/test_suite_bignum_mod_raw.data
+++ b/tests/suites/test_suite_bignum_mod_raw.data
@@ -178,3 +178,83 @@
 
 mbedtls_mpi_mod_raw_cond_swap: copy half of the limbs
 mpi_mod_raw_cond_swap:"00000000FFFFFFFF55555555AAAAAAAA":"FEDCBA9876543210FEDCBA9876543210":8
+
+BEGIN MERGE SLOT 1
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 1
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 2
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 2
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 3
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 3
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 4
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 4
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 5
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 5
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 6
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 6
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 7
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 7
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 8
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 8
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 9
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 9
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+BEGIN MERGE SLOT 10
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+
+END MERGE SLOT 10
+depends_on:MBEDTLS_BIGNUM_MERGE
+mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
diff --git a/tests/suites/test_suite_bignum_mod_raw.function b/tests/suites/test_suite_bignum_mod_raw.function
index 7c9d5db..a6361d7 100644
--- a/tests/suites/test_suite_bignum_mod_raw.function
+++ b/tests/suites/test_suite_bignum_mod_raw.function
@@ -279,4 +279,44 @@
     mbedtls_mpi_mod_modulus_free( &m );
     mbedtls_free( buff_m );
 }
+
+/* BEGIN MERGE SLOT 1 */
+
+/* END MERGE SLOT 1 */
+
+/* BEGIN MERGE SLOT 2 */
+
+/* END MERGE SLOT 2 */
+
+/* BEGIN MERGE SLOT 3 */
+
+/* END MERGE SLOT 3 */
+
+/* BEGIN MERGE SLOT 4 */
+
+/* END MERGE SLOT 4 */
+
+/* BEGIN MERGE SLOT 5 */
+
+/* END MERGE SLOT 5 */
+
+/* BEGIN MERGE SLOT 6 */
+
+/* END MERGE SLOT 6 */
+
+/* BEGIN MERGE SLOT 7 */
+
+/* END MERGE SLOT 7 */
+
+/* BEGIN MERGE SLOT 8 */
+
+/* END MERGE SLOT 8 */
+
+/* BEGIN MERGE SLOT 9 */
+
+/* END MERGE SLOT 9 */
+
+/* BEGIN MERGE SLOT 10 */
+
+/* END MERGE SLOT 10 */
 /* END_CASE */