Benchmark more "boring" emails, not ones from the test-data dir

benches/receive_emails.rs

@@ -30,29 +30,37 @@ async fn recv_emails(context: Context, emails: &[&[u8]]) -> Context {
 
 async fn recv_all_emails(mut context: Context, needs_move_enabled: bool) -> Context {
     context.disable_needs_move = !needs_move_enabled;
-    let emails = [
+
-        include_bytes!("../test-data/message/allinkl-quote.eml").as_ref(),
+    for i in 0..100 {
-        include_bytes!("../test-data/message/apple_cid_jpg.eml").as_ref(),
+        let imf_raw = format!(
-        include_bytes!("../test-data/message/attach_filename_encoded_words_windows1251.eml")
+            "Subject: Benchmark
-            .as_ref(),
+Message-ID: Mr.OssSYnOFkhR.{i}@testrun.org
-        include_bytes!("../test-data/message/attach_filename_simple.eml").as_ref(),
+Date: Sat, 07 Dec 2019 19:00:27 +0000
-        include_bytes!("../test-data/message/AutocryptSetupMessage.eml").as_ref(),
+To: alice@example.com
-        include_bytes!("../test-data/message/blockquote-tag.eml").as_ref(),
+From: sender@testrun.org
-        include_bytes!("../test-data/message/cp1252-html.eml").as_ref(),
+Chat-Version: 1.0
-        include_bytes!("../test-data/message/gmail_ndn.eml").as_ref(),
+Chat-Disposition-Notification-To: sender@testrun.org
-        include_bytes!("../test-data/message/gmx-quote.eml").as_ref(),
+Chat-User-Avatar: 0
-        include_bytes!("../test-data/message/mail_attach_txt.eml").as_ref(),
+In-Reply-To: Mr.OssSYnOFkhR.{i_dec}@testrun.org
-        include_bytes!("../test-data/message/mailinglist_xt_local_spiegel.eml").as_ref(),
+MIME-Version: 1.0
-        include_bytes!("../test-data/message/mail_with_user_and_group_avatars.eml").as_ref(),
+
-        include_bytes!("../test-data/message/pdf_filename_continuation.eml").as_ref(),
+Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-        include_bytes!("../test-data/message/protonmail-repaired.eml").as_ref(),
+
-        include_bytes!("../test-data/message/subj_with_multimedia_msg.eml").as_ref(),
+Hello {i}",
-        include_bytes!("../test-data/message/text_alt_plain_html.eml").as_ref(),
+            i = i,
-        include_bytes!("../test-data/message/text_html.eml").as_ref(),
+            i_dec = i - 1,
-        include_bytes!("../test-data/message/videochat_invitation.eml").as_ref(),
+        );
-        include_bytes!("../test-data/message/wrong-html.eml").as_ref(),
+        dc_receive_imf(
-    ];
+            &context,
-    recv_emails(context, &emails).await
+            imf_raw.as_bytes(),
+            "INBOX",
+            black_box(i.try_into().unwrap()),
+            false,
+        )
+        .await
+        .unwrap();
+    }
+    context
 }
 
 async fn create_context() -> Context {

deltachat-test-messages/src/lib.rs

@@ -1,66 +0,0 @@
-use once_cell::sync::Lazy;
-
-pub static ALL_TEST_MESSAGES: Lazy<[&[u8]; 56]> = Lazy::new(|| {
-    [
-        include_bytes!("../../test-data/message/allinkl-quote.eml").as_ref(),
-        include_bytes!("../../test-data/message/apple_cid_jpg.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_apostrophed_cont.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_apostrophed_cp1252.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_apostrophed.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_apostrophed_invalid.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_apostrophed_windows1251.eml")
-            .as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_combined.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_encoded_words_bad_delimiter.eml")
-            .as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_encoded_words_binary.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_encoded_words_cont.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_encoded_words.eml").as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_encoded_words_windows1251.eml")
-            .as_ref(),
-        include_bytes!("../../test-data/message/attach_filename_simple.eml").as_ref(),
-        include_bytes!("../../test-data/message/AutocryptSetupMessage.eml").as_ref(),
-        include_bytes!("../../test-data/message/blockquote-tag.eml").as_ref(),
-        include_bytes!("../../test-data/message/cp1252-html.eml").as_ref(),
-        include_bytes!("../../test-data/message/gmail_ndn.eml").as_ref(),
-        include_bytes!("../../test-data/message/gmail_ndn_group.eml").as_ref(),
-        include_bytes!("../../test-data/message/gmx-forward.eml").as_ref(),
-        include_bytes!("../../test-data/message/gmx_ndn.eml").as_ref(),
-        include_bytes!("../../test-data/message/gmx-quote-body.eml").as_ref(),
-        include_bytes!("../../test-data/message/gmx-quote.eml").as_ref(),
-        include_bytes!("../../test-data/message/mail_attach_txt.eml").as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_dhl.eml").as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_dpd.eml").as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_ttline.eml").as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_with_mimepart_footer.eml").as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_with_mimepart_footer_signed.eml")
-            .as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_xing.eml").as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_xt_local_microsoft.eml").as_ref(),
-        include_bytes!("../../test-data/message/mailinglist_xt_local_spiegel.eml").as_ref(),
-        include_bytes!("../../test-data/message/mail_with_user_and_group_avatars.eml").as_ref(),
-        include_bytes!("../../test-data/message/mail_with_user_avatar_deleted.eml").as_ref(),
-        include_bytes!("../../test-data/message/mail_with_user_avatar.eml").as_ref(),
-        include_bytes!("../../test-data/message/many_images_amazon_via_apple_mail.eml").as_ref(),
-        include_bytes!("../../test-data/message/pdf_filename_continuation.eml").as_ref(),
-        include_bytes!("../../test-data/message/pdf_filename_simple.eml").as_ref(),
-        include_bytes!("../../test-data/message/posteo_ndn.eml").as_ref(),
-        include_bytes!("../../test-data/message/protonmail-mixed-up.eml").as_ref(),
-        include_bytes!("../../test-data/message/protonmail-repaired.eml").as_ref(),
-        include_bytes!("../../test-data/message/quote_attach.eml").as_ref(),
-        include_bytes!("../../test-data/message/subj_with_multimedia_msg.eml").as_ref(),
-        include_bytes!("../../test-data/message/testrun_ndn_2.eml").as_ref(),
-        include_bytes!("../../test-data/message/testrun_ndn.eml").as_ref(),
-        include_bytes!("../../test-data/message/text_alt_html.eml").as_ref(),
-        include_bytes!("../../test-data/message/text_alt_plain.eml").as_ref(),
-        include_bytes!("../../test-data/message/text_alt_plain_html.eml").as_ref(),
-        include_bytes!("../../test-data/message/text_html.eml").as_ref(),
-        include_bytes!("../../test-data/message/text_plain_flowed.eml").as_ref(),
-        include_bytes!("../../test-data/message/text_plain_iso88591.eml").as_ref(),
-        include_bytes!("../../test-data/message/text_plain_unspecified.eml").as_ref(),
-        include_bytes!("../../test-data/message/tiscali_ndn.eml").as_ref(),
-        include_bytes!("../../test-data/message/videochat_invitation.eml").as_ref(),
-        include_bytes!("../../test-data/message/yahoo_ndn.eml").as_ref(),
-        include_bytes!("../../test-data/message/wrong-html.eml").as_ref(),
-    ]
-});