diff --git a/meson.build b/meson.build index b8f4afdf..3cd6b1eb 100644 --- a/meson.build +++ b/meson.build @@ -135,7 +135,7 @@ else message('no wordexp, no command-line option expansion') endif -testmaildir=join_paths(meson.current_source_dir(), 'lib', 'tests') +testmaildir=join_paths(meson.current_source_dir(), 'testdata') config_h_data.set_quoted('MU_TESTMAILDIR', join_paths(testmaildir, 'testdir')) config_h_data.set_quoted('MU_TESTMAILDIR2', join_paths(testmaildir, 'testdir2')) config_h_data.set_quoted('MU_TESTMAILDIR4', join_paths(testmaildir, 'testdir4')) diff --git a/lib/tests/cjk/cur/test1 b/testdata/cjk/cur/test1 similarity index 100% rename from lib/tests/cjk/cur/test1 rename to testdata/cjk/cur/test1 diff --git a/lib/tests/cjk/cur/test2 b/testdata/cjk/cur/test2 similarity index 100% rename from lib/tests/cjk/cur/test2 rename to testdata/cjk/cur/test2 diff --git a/lib/tests/cjk/cur/test3 b/testdata/cjk/cur/test3 similarity index 100% rename from lib/tests/cjk/cur/test3 rename to testdata/cjk/cur/test3 diff --git a/lib/tests/cjk/cur/test4 b/testdata/cjk/cur/test4 similarity index 100% rename from lib/tests/cjk/cur/test4 rename to testdata/cjk/cur/test4 diff --git a/lib/tests/testdir/cur/1220863042.12663_1.mindcrime!2,S b/testdata/testdir/cur/1220863042.12663_1.mindcrime!2,S similarity index 100% rename from lib/tests/testdir/cur/1220863042.12663_1.mindcrime!2,S rename to testdata/testdir/cur/1220863042.12663_1.mindcrime!2,S diff --git a/lib/tests/testdir/cur/1220863060.12663_3.mindcrime!2,S b/testdata/testdir/cur/1220863060.12663_3.mindcrime!2,S similarity index 100% rename from lib/tests/testdir/cur/1220863060.12663_3.mindcrime!2,S rename to testdata/testdir/cur/1220863060.12663_3.mindcrime!2,S diff --git a/lib/tests/testdir/cur/1220863087.12663_15.mindcrime!2,PS b/testdata/testdir/cur/1220863087.12663_15.mindcrime!2,PS similarity index 100% rename from lib/tests/testdir/cur/1220863087.12663_15.mindcrime!2,PS rename to testdata/testdir/cur/1220863087.12663_15.mindcrime!2,PS diff --git a/lib/tests/testdir/cur/1220863087.12663_19.mindcrime!2,S b/testdata/testdir/cur/1220863087.12663_19.mindcrime!2,S similarity index 100% rename from lib/tests/testdir/cur/1220863087.12663_19.mindcrime!2,S rename to testdata/testdir/cur/1220863087.12663_19.mindcrime!2,S diff --git a/lib/tests/testdir/cur/1220863087.12663_5.mindcrime!2,S b/testdata/testdir/cur/1220863087.12663_5.mindcrime!2,S similarity index 100% rename from lib/tests/testdir/cur/1220863087.12663_5.mindcrime!2,S rename to testdata/testdir/cur/1220863087.12663_5.mindcrime!2,S diff --git a/lib/tests/testdir/cur/1220863087.12663_7.mindcrime!2,RS b/testdata/testdir/cur/1220863087.12663_7.mindcrime!2,RS similarity index 100% rename from lib/tests/testdir/cur/1220863087.12663_7.mindcrime!2,RS rename to testdata/testdir/cur/1220863087.12663_7.mindcrime!2,RS diff --git a/lib/tests/testdir/cur/1252168370_3.14675.cthulhu!2,S b/testdata/testdir/cur/1252168370_3.14675.cthulhu!2,S similarity index 100% rename from lib/tests/testdir/cur/1252168370_3.14675.cthulhu!2,S rename to testdata/testdir/cur/1252168370_3.14675.cthulhu!2,S diff --git a/lib/tests/testdir/cur/1283599333.1840_11.cthulhu!2, b/testdata/testdir/cur/1283599333.1840_11.cthulhu!2, similarity index 100% rename from lib/tests/testdir/cur/1283599333.1840_11.cthulhu!2, rename to testdata/testdir/cur/1283599333.1840_11.cthulhu!2, diff --git a/lib/tests/testdir/cur/1305664394.2171_402.cthulhu!2, b/testdata/testdir/cur/1305664394.2171_402.cthulhu!2, similarity index 100% rename from lib/tests/testdir/cur/1305664394.2171_402.cthulhu!2, rename to testdata/testdir/cur/1305664394.2171_402.cthulhu!2, diff --git a/lib/tests/testdir/cur/encrypted!2,S b/testdata/testdir/cur/encrypted!2,S similarity index 100% rename from lib/tests/testdir/cur/encrypted!2,S rename to testdata/testdir/cur/encrypted!2,S diff --git a/lib/tests/testdir/cur/multimime!2,FS b/testdata/testdir/cur/multimime!2,FS similarity index 100% rename from lib/tests/testdir/cur/multimime!2,FS rename to testdata/testdir/cur/multimime!2,FS diff --git a/lib/tests/testdir/cur/multirecip!2,S b/testdata/testdir/cur/multirecip!2,S similarity index 100% rename from lib/tests/testdir/cur/multirecip!2,S rename to testdata/testdir/cur/multirecip!2,S diff --git a/lib/tests/testdir/cur/signed!2,S b/testdata/testdir/cur/signed!2,S similarity index 100% rename from lib/tests/testdir/cur/signed!2,S rename to testdata/testdir/cur/signed!2,S diff --git a/lib/tests/testdir/cur/signed-encrypted!2,S b/testdata/testdir/cur/signed-encrypted!2,S similarity index 100% rename from lib/tests/testdir/cur/signed-encrypted!2,S rename to testdata/testdir/cur/signed-encrypted!2,S diff --git a/lib/tests/testdir/cur/special!2,Sabc b/testdata/testdir/cur/special!2,Sabc similarity index 100% rename from lib/tests/testdir/cur/special!2,Sabc rename to testdata/testdir/cur/special!2,Sabc diff --git a/lib/tests/testdir/new/1220863087.12663_21.mindcrime b/testdata/testdir/new/1220863087.12663_21.mindcrime similarity index 100% rename from lib/tests/testdir/new/1220863087.12663_21.mindcrime rename to testdata/testdir/new/1220863087.12663_21.mindcrime diff --git a/lib/tests/testdir/new/1220863087.12663_23.mindcrime b/testdata/testdir/new/1220863087.12663_23.mindcrime similarity index 100% rename from lib/tests/testdir/new/1220863087.12663_23.mindcrime rename to testdata/testdir/new/1220863087.12663_23.mindcrime diff --git a/lib/tests/testdir/new/1220863087.12663_25.mindcrime b/testdata/testdir/new/1220863087.12663_25.mindcrime similarity index 100% rename from lib/tests/testdir/new/1220863087.12663_25.mindcrime rename to testdata/testdir/new/1220863087.12663_25.mindcrime diff --git a/lib/tests/testdir/new/1220863087.12663_9.mindcrime b/testdata/testdir/new/1220863087.12663_9.mindcrime similarity index 100% rename from lib/tests/testdir/new/1220863087.12663_9.mindcrime rename to testdata/testdir/new/1220863087.12663_9.mindcrime diff --git a/lib/tests/testdir/tmp/1220863087.12663.ignore b/testdata/testdir/tmp/1220863087.12663.ignore similarity index 100% rename from lib/tests/testdir/tmp/1220863087.12663.ignore rename to testdata/testdir/tmp/1220863087.12663.ignore diff --git a/lib/tests/testdir2/Foo/cur/arto.eml b/testdata/testdir2/Foo/cur/arto.eml similarity index 100% rename from lib/tests/testdir2/Foo/cur/arto.eml rename to testdata/testdir2/Foo/cur/arto.eml diff --git a/lib/tests/testdir2/Foo/cur/fraiche.eml b/testdata/testdir2/Foo/cur/fraiche.eml similarity index 100% rename from lib/tests/testdir2/Foo/cur/fraiche.eml rename to testdata/testdir2/Foo/cur/fraiche.eml diff --git a/lib/tests/testdir2/Foo/cur/mail5 b/testdata/testdir2/Foo/cur/mail5 similarity index 100% rename from lib/tests/testdir2/Foo/cur/mail5 rename to testdata/testdir2/Foo/cur/mail5 diff --git a/lib/tests/testdir2/Foo/new/.noindex b/testdata/testdir2/Foo/new/.noindex similarity index 100% rename from lib/tests/testdir2/Foo/new/.noindex rename to testdata/testdir2/Foo/new/.noindex diff --git a/lib/tests/testdir2/Foo/tmp/.noindex b/testdata/testdir2/Foo/tmp/.noindex similarity index 100% rename from lib/tests/testdir2/Foo/tmp/.noindex rename to testdata/testdir2/Foo/tmp/.noindex diff --git a/lib/tests/testdir2/bar/cur/181736.eml b/testdata/testdir2/bar/cur/181736.eml similarity index 100% rename from lib/tests/testdir2/bar/cur/181736.eml rename to testdata/testdir2/bar/cur/181736.eml diff --git a/lib/tests/testdir2/bar/cur/mail1 b/testdata/testdir2/bar/cur/mail1 similarity index 100% rename from lib/tests/testdir2/bar/cur/mail1 rename to testdata/testdir2/bar/cur/mail1 diff --git a/lib/tests/testdir2/bar/cur/mail2 b/testdata/testdir2/bar/cur/mail2 similarity index 100% rename from lib/tests/testdir2/bar/cur/mail2 rename to testdata/testdir2/bar/cur/mail2 diff --git a/lib/tests/testdir2/bar/cur/mail3 b/testdata/testdir2/bar/cur/mail3 similarity index 100% rename from lib/tests/testdir2/bar/cur/mail3 rename to testdata/testdir2/bar/cur/mail3 diff --git a/lib/tests/testdir2/bar/cur/mail4 b/testdata/testdir2/bar/cur/mail4 similarity index 100% rename from lib/tests/testdir2/bar/cur/mail4 rename to testdata/testdir2/bar/cur/mail4 diff --git a/lib/tests/testdir2/bar/cur/mail5 b/testdata/testdir2/bar/cur/mail5 similarity index 100% rename from lib/tests/testdir2/bar/cur/mail5 rename to testdata/testdir2/bar/cur/mail5 diff --git a/lib/tests/testdir2/bar/cur/mail6 b/testdata/testdir2/bar/cur/mail6 similarity index 100% rename from lib/tests/testdir2/bar/cur/mail6 rename to testdata/testdir2/bar/cur/mail6 diff --git a/lib/tests/testdir2/bar/new/.noindex b/testdata/testdir2/bar/new/.noindex similarity index 100% rename from lib/tests/testdir2/bar/new/.noindex rename to testdata/testdir2/bar/new/.noindex diff --git a/lib/tests/testdir2/bar/tmp/.noindex b/testdata/testdir2/bar/tmp/.noindex similarity index 100% rename from lib/tests/testdir2/bar/tmp/.noindex rename to testdata/testdir2/bar/tmp/.noindex diff --git a/lib/tests/testdir2/wom_bat/cur/atomic b/testdata/testdir2/wom_bat/cur/atomic similarity index 100% rename from lib/tests/testdir2/wom_bat/cur/atomic rename to testdata/testdir2/wom_bat/cur/atomic diff --git a/lib/tests/testdir2/wom_bat/cur/rfc822.1 b/testdata/testdir2/wom_bat/cur/rfc822.1 similarity index 100% rename from lib/tests/testdir2/wom_bat/cur/rfc822.1 rename to testdata/testdir2/wom_bat/cur/rfc822.1 diff --git a/lib/tests/testdir2/wom_bat/cur/rfc822.2 b/testdata/testdir2/wom_bat/cur/rfc822.2 similarity index 100% rename from lib/tests/testdir2/wom_bat/cur/rfc822.2 rename to testdata/testdir2/wom_bat/cur/rfc822.2 diff --git a/lib/tests/testdir4/1220863042.12663_1.mindcrime!2,S b/testdata/testdir4/1220863042.12663_1.mindcrime!2,S similarity index 100% rename from lib/tests/testdir4/1220863042.12663_1.mindcrime!2,S rename to testdata/testdir4/1220863042.12663_1.mindcrime!2,S diff --git a/lib/tests/testdir4/1220863087.12663_19.mindcrime!2,S b/testdata/testdir4/1220863087.12663_19.mindcrime!2,S similarity index 100% rename from lib/tests/testdir4/1220863087.12663_19.mindcrime!2,S rename to testdata/testdir4/1220863087.12663_19.mindcrime!2,S diff --git a/lib/tests/testdir4/1252168370_3.14675.cthulhu!2,S b/testdata/testdir4/1252168370_3.14675.cthulhu!2,S similarity index 100% rename from lib/tests/testdir4/1252168370_3.14675.cthulhu!2,S rename to testdata/testdir4/1252168370_3.14675.cthulhu!2,S diff --git a/lib/tests/testdir4/1283599333.1840_11.cthulhu!2, b/testdata/testdir4/1283599333.1840_11.cthulhu!2, similarity index 100% rename from lib/tests/testdir4/1283599333.1840_11.cthulhu!2, rename to testdata/testdir4/1283599333.1840_11.cthulhu!2, diff --git a/lib/tests/testdir4/1305664394.2171_402.cthulhu!2, b/testdata/testdir4/1305664394.2171_402.cthulhu!2, similarity index 100% rename from lib/tests/testdir4/1305664394.2171_402.cthulhu!2, rename to testdata/testdir4/1305664394.2171_402.cthulhu!2, diff --git a/lib/tests/testdir4/181736.eml b/testdata/testdir4/181736.eml similarity index 100% rename from lib/tests/testdir4/181736.eml rename to testdata/testdir4/181736.eml diff --git a/lib/tests/testdir4/encrypted!2,S b/testdata/testdir4/encrypted!2,S similarity index 100% rename from lib/tests/testdir4/encrypted!2,S rename to testdata/testdir4/encrypted!2,S diff --git a/lib/tests/testdir4/mail1 b/testdata/testdir4/mail1 similarity index 100% rename from lib/tests/testdir4/mail1 rename to testdata/testdir4/mail1 diff --git a/lib/tests/testdir4/mail5 b/testdata/testdir4/mail5 similarity index 100% rename from lib/tests/testdir4/mail5 rename to testdata/testdir4/mail5 diff --git a/lib/tests/testdir4/multimime!2,FS b/testdata/testdir4/multimime!2,FS similarity index 100% rename from lib/tests/testdir4/multimime!2,FS rename to testdata/testdir4/multimime!2,FS diff --git a/lib/tests/testdir4/signed!2,S b/testdata/testdir4/signed!2,S similarity index 100% rename from lib/tests/testdir4/signed!2,S rename to testdata/testdir4/signed!2,S diff --git a/lib/tests/testdir4/signed-bad!2,S b/testdata/testdir4/signed-bad!2,S similarity index 100% rename from lib/tests/testdir4/signed-bad!2,S rename to testdata/testdir4/signed-bad!2,S diff --git a/lib/tests/testdir4/signed-encrypted!2,S b/testdata/testdir4/signed-encrypted!2,S similarity index 100% rename from lib/tests/testdir4/signed-encrypted!2,S rename to testdata/testdir4/signed-encrypted!2,S diff --git a/lib/tests/testdir4/special!2,Sabc b/testdata/testdir4/special!2,Sabc similarity index 100% rename from lib/tests/testdir4/special!2,Sabc rename to testdata/testdir4/special!2,Sabc