From be136522961081c83b9e129c80e81dbee25e9690 Mon Sep 17 00:00:00 2001 From: Janos Follath Date: Wed, 2 Nov 2022 15:12:04 +0000 Subject: [PATCH] Use comments for merge separators in .data files We do have a comment syntax for .data files, there is no need for dummy test cases. Signed-off-by: Janos Follath --- tests/suites/test_suite_bignum_core.misc.data | 80 +++++------------- tests/suites/test_suite_bignum_mod.data | 81 +++++-------------- tests/suites/test_suite_bignum_mod_raw.data | 81 +++++-------------- 3 files changed, 62 insertions(+), 180 deletions(-) diff --git a/tests/suites/test_suite_bignum_core.misc.data b/tests/suites/test_suite_bignum_core.misc.data index 28de24392..30c767c74 100644 --- a/tests/suites/test_suite_bignum_core.misc.data +++ b/tests/suites/test_suite_bignum_core.misc.data @@ -431,82 +431,42 @@ mpi_core_fill_random:42:0:-1:0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA 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 +# BEGIN MERGE SLOT 1 -END MERGE SLOT 1 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 1 -BEGIN MERGE SLOT 2 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 2 -END MERGE SLOT 2 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 2 -BEGIN MERGE SLOT 3 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 3 -END MERGE SLOT 3 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 3 -BEGIN MERGE SLOT 4 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 4 -END MERGE SLOT 4 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 4 -BEGIN MERGE SLOT 5 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 5 -END MERGE SLOT 5 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 5 -BEGIN MERGE SLOT 6 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 6 -END MERGE SLOT 6 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 6 -BEGIN MERGE SLOT 7 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 7 -END MERGE SLOT 7 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 7 -BEGIN MERGE SLOT 8 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 8 -END MERGE SLOT 8 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 8 -BEGIN MERGE SLOT 9 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 9 -END MERGE SLOT 9 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 9 -BEGIN MERGE SLOT 10 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# BEGIN MERGE SLOT 10 -END MERGE SLOT 10 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_core_io_null +# END MERGE SLOT 10 diff --git a/tests/suites/test_suite_bignum_mod.data b/tests/suites/test_suite_bignum_mod.data index c80bfa338..d06541fd6 100644 --- a/tests/suites/test_suite_bignum_mod.data +++ b/tests/suites/test_suite_bignum_mod.data @@ -25,82 +25,43 @@ mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_OPT_RED:0 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 +# BEGIN MERGE SLOT 1 -END 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 -BEGIN 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 2 -END 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 -BEGIN 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 3 -END 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 -BEGIN 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 4 -END 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 -BEGIN 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 5 -END 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 -BEGIN 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 6 -END 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 -BEGIN 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 7 -END 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 -BEGIN 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 8 -END 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 -BEGIN 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 9 -END 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 -BEGIN MERGE SLOT 10 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0 +# BEGIN MERGE SLOT 10 + +# END MERGE SLOT 10 -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_raw.data b/tests/suites/test_suite_bignum_mod_raw.data index c47d47396..6644b1e22 100644 --- a/tests/suites/test_suite_bignum_mod_raw.data +++ b/tests/suites/test_suite_bignum_mod_raw.data @@ -179,82 +179,43 @@ mpi_mod_raw_cond_swap:"000000001111111122222222333333334444444455555555666666667 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 +# BEGIN MERGE SLOT 1 -END 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 -BEGIN 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 2 -END 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 -BEGIN 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 3 -END 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 -BEGIN 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 4 -END 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 -BEGIN 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 5 -END 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 -BEGIN 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 6 -END 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 -BEGIN 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 7 -END 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 -BEGIN 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 8 -END 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 -BEGIN 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 9 -END 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 -BEGIN MERGE SLOT 10 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0 +# BEGIN MERGE SLOT 10 + +# END MERGE SLOT 10 -END MERGE SLOT 10 -depends_on:MBEDTLS_BIGNUM_MERGE -mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0