From 035a10ab49439bd1d2e250d87d369307d86a31b3 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 20 Jan 2021 11:46:14 +0200 Subject: [PATCH] remove obsolete threading tests --- lib/Makefile.am | 52 +-- lib/testdir3/cycle/cur/cycle0 | 7 - lib/testdir3/cycle/cur/cycle0.0 | 8 - lib/testdir3/cycle/cur/cycle0.0.0 | 8 - lib/testdir3/cycle/cur/rogue0 | 8 - lib/testdir3/cycle/new/.noindex | 0 lib/testdir3/cycle/tmp/.noindex | 0 .../sort/1st-child-promotes-thread/cur/A | 7 - .../sort/1st-child-promotes-thread/cur/B | 7 - .../sort/1st-child-promotes-thread/cur/C | 7 - .../sort/1st-child-promotes-thread/cur/D | 9 - .../1st-child-promotes-thread/new/.noindex | 0 .../1st-child-promotes-thread/tmp/.noindex | 0 .../sort/2nd-child-promotes-thread/cur/A | 7 - .../sort/2nd-child-promotes-thread/cur/B | 7 - .../sort/2nd-child-promotes-thread/cur/C | 9 - .../sort/2nd-child-promotes-thread/cur/D | 7 - .../sort/2nd-child-promotes-thread/cur/E | 9 - .../2nd-child-promotes-thread/new/.noindex | 0 .../2nd-child-promotes-thread/tmp/.noindex | 0 .../sort/child-does-not-promote-thread/cur/A | 9 - .../sort/child-does-not-promote-thread/cur/X | 7 - .../sort/child-does-not-promote-thread/cur/Y | 7 - .../sort/child-does-not-promote-thread/cur/Z | 7 - .../new/.noindex | 0 .../tmp/.noindex | 0 .../grandchild-promotes-only-subthread/cur/A | 7 - .../grandchild-promotes-only-subthread/cur/B | 7 - .../grandchild-promotes-only-subthread/cur/C | 9 - .../grandchild-promotes-only-subthread/cur/D | 9 - .../grandchild-promotes-only-subthread/cur/E | 9 - .../grandchild-promotes-only-subthread/cur/F | 9 - .../grandchild-promotes-only-subthread/cur/G | 7 - .../new/.noindex | 0 .../tmp/.noindex | 0 .../sort/grandchild-promotes-thread/cur/A | 7 - .../sort/grandchild-promotes-thread/cur/B | 7 - .../sort/grandchild-promotes-thread/cur/C | 9 - .../sort/grandchild-promotes-thread/cur/D | 7 - .../sort/grandchild-promotes-thread/cur/E | 9 - .../grandchild-promotes-thread/new/.noindex | 0 .../grandchild-promotes-thread/tmp/.noindex | 0 lib/testdir3/tree/cur/child0.0 | 9 - lib/testdir3/tree/cur/child0.1 | 9 - lib/testdir3/tree/cur/child0.1.0 | 9 - lib/testdir3/tree/cur/child2.0.0 | 12 - lib/testdir3/tree/cur/child3.0.0.0.0 | 9 - lib/testdir3/tree/cur/child4.0 | 9 - lib/testdir3/tree/cur/child4.1 | 9 - lib/testdir3/tree/cur/root0 | 7 - lib/testdir3/tree/cur/root1 | 7 - lib/testdir3/tree/cur/root2 | 7 - lib/testdir3/tree/new/.noindex | 0 lib/testdir3/tree/tmp/.noindex | 0 mu/Makefile.am | 6 - mu/test-mu-threads.cc | 408 ------------------ 56 files changed, 1 insertion(+), 778 deletions(-) delete mode 100644 lib/testdir3/cycle/cur/cycle0 delete mode 100644 lib/testdir3/cycle/cur/cycle0.0 delete mode 100644 lib/testdir3/cycle/cur/cycle0.0.0 delete mode 100644 lib/testdir3/cycle/cur/rogue0 delete mode 100644 lib/testdir3/cycle/new/.noindex delete mode 100644 lib/testdir3/cycle/tmp/.noindex delete mode 100644 lib/testdir3/sort/1st-child-promotes-thread/cur/A delete mode 100644 lib/testdir3/sort/1st-child-promotes-thread/cur/B delete mode 100644 lib/testdir3/sort/1st-child-promotes-thread/cur/C delete mode 100644 lib/testdir3/sort/1st-child-promotes-thread/cur/D delete mode 100644 lib/testdir3/sort/1st-child-promotes-thread/new/.noindex delete mode 100644 lib/testdir3/sort/1st-child-promotes-thread/tmp/.noindex delete mode 100644 lib/testdir3/sort/2nd-child-promotes-thread/cur/A delete mode 100644 lib/testdir3/sort/2nd-child-promotes-thread/cur/B delete mode 100644 lib/testdir3/sort/2nd-child-promotes-thread/cur/C delete mode 100644 lib/testdir3/sort/2nd-child-promotes-thread/cur/D delete mode 100644 lib/testdir3/sort/2nd-child-promotes-thread/cur/E delete mode 100644 lib/testdir3/sort/2nd-child-promotes-thread/new/.noindex delete mode 100644 lib/testdir3/sort/2nd-child-promotes-thread/tmp/.noindex delete mode 100644 lib/testdir3/sort/child-does-not-promote-thread/cur/A delete mode 100644 lib/testdir3/sort/child-does-not-promote-thread/cur/X delete mode 100644 lib/testdir3/sort/child-does-not-promote-thread/cur/Y delete mode 100644 lib/testdir3/sort/child-does-not-promote-thread/cur/Z delete mode 100644 lib/testdir3/sort/child-does-not-promote-thread/new/.noindex delete mode 100644 lib/testdir3/sort/child-does-not-promote-thread/tmp/.noindex delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/cur/A delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/cur/B delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/cur/C delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/cur/D delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/cur/E delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/cur/F delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/cur/G delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/new/.noindex delete mode 100644 lib/testdir3/sort/grandchild-promotes-only-subthread/tmp/.noindex delete mode 100644 lib/testdir3/sort/grandchild-promotes-thread/cur/A delete mode 100644 lib/testdir3/sort/grandchild-promotes-thread/cur/B delete mode 100644 lib/testdir3/sort/grandchild-promotes-thread/cur/C delete mode 100644 lib/testdir3/sort/grandchild-promotes-thread/cur/D delete mode 100644 lib/testdir3/sort/grandchild-promotes-thread/cur/E delete mode 100644 lib/testdir3/sort/grandchild-promotes-thread/new/.noindex delete mode 100644 lib/testdir3/sort/grandchild-promotes-thread/tmp/.noindex delete mode 100644 lib/testdir3/tree/cur/child0.0 delete mode 100644 lib/testdir3/tree/cur/child0.1 delete mode 100644 lib/testdir3/tree/cur/child0.1.0 delete mode 100644 lib/testdir3/tree/cur/child2.0.0 delete mode 100644 lib/testdir3/tree/cur/child3.0.0.0.0 delete mode 100644 lib/testdir3/tree/cur/child4.0 delete mode 100644 lib/testdir3/tree/cur/child4.1 delete mode 100644 lib/testdir3/tree/cur/root0 delete mode 100644 lib/testdir3/tree/cur/root1 delete mode 100644 lib/testdir3/tree/cur/root2 delete mode 100644 lib/testdir3/tree/new/.noindex delete mode 100644 lib/testdir3/tree/tmp/.noindex delete mode 100644 mu/test-mu-threads.cc diff --git a/lib/Makefile.am b/lib/Makefile.am index eee8c694..84bc9a36 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2020 Dirk-Jan C. Binnema +## Copyright (C) 2010-2021 Dirk-Jan C. Binnema ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ SUBDIRS= utils index TESTDEFS= \ -DMU_TESTMAILDIR=\"${abs_srcdir}/testdir\" \ -DMU_TESTMAILDIR2=\"${abs_srcdir}/testdir2\" \ - -DMU_TESTMAILDIR3=\"${abs_srcdir}/testdir3\" \ -DMU_TESTMAILDIR4=\"${abs_srcdir}/testdir4\" \ -DABS_CURDIR=\"${abs_builddir}\" \ -DABS_SRCDIR=\"${abs_srcdir}\" @@ -164,11 +163,6 @@ TEST_PROGS+=test-tokenizer test_tokenizer_SOURCES=test-tokenizer.cc test_tokenizer_LDADD=libtestmucommon.la -TEST_PROGS+=test-threader -test_threader_SOURCES=mu-query-threader.cc -test_threader_LDADD=libtestmucommon.la -test_threader_CXXFLAGS=$(AM_CXXFLAGS) -DBUILD_TESTS - TEST_PROGS+=test-threads test_threads_SOURCES=mu-query-threads.cc test_threads_LDADD=libtestmucommon.la @@ -235,50 +229,6 @@ EXTRA_DIST+= \ testdir2/wom_bat/cur/atomic \ testdir2/wom_bat/cur/rfc822.1 \ testdir2/wom_bat/cur/rfc822.2 \ - testdir3/cycle \ - testdir3/cycle/new/.noindex \ - testdir3/cycle/cur/rogue0 \ - testdir3/cycle/cur/cycle0 \ - testdir3/cycle/cur/cycle0.0 \ - testdir3/cycle/cur/cycle0.0.0 \ - testdir3/cycle/tmp/.noindex \ - testdir3/tree/new/.noindex \ - testdir3/tree/cur/child0.0 \ - testdir3/tree/cur/child4.0 \ - testdir3/tree/cur/root2 \ - testdir3/tree/cur/root1 \ - testdir3/tree/cur/child3.0.0.0.0 \ - testdir3/tree/cur/root0 \ - testdir3/tree/cur/child2.0.0 \ - testdir3/tree/cur/child0.1 \ - testdir3/tree/cur/child0.1.0 \ - testdir3/tree/cur/child4.1 \ - testdir3/tree/tmp/.noindex \ - testdir3/sort/1st-child-promotes-thread/cur/A \ - testdir3/sort/1st-child-promotes-thread/cur/B \ - testdir3/sort/1st-child-promotes-thread/cur/C \ - testdir3/sort/1st-child-promotes-thread/cur/D \ - testdir3/sort/2nd-child-promotes-thread/cur/A \ - testdir3/sort/2nd-child-promotes-thread/cur/B \ - testdir3/sort/2nd-child-promotes-thread/cur/C \ - testdir3/sort/2nd-child-promotes-thread/cur/D \ - testdir3/sort/2nd-child-promotes-thread/cur/E \ - testdir3/sort/child-does-not-promote-thread/cur/A \ - testdir3/sort/child-does-not-promote-thread/cur/X \ - testdir3/sort/child-does-not-promote-thread/cur/Y \ - testdir3/sort/child-does-not-promote-thread/cur/Z \ - testdir3/sort/grandchild-promotes-only-subthread/cur/A \ - testdir3/sort/grandchild-promotes-only-subthread/cur/B \ - testdir3/sort/grandchild-promotes-only-subthread/cur/C \ - testdir3/sort/grandchild-promotes-only-subthread/cur/D \ - testdir3/sort/grandchild-promotes-only-subthread/cur/E \ - testdir3/sort/grandchild-promotes-only-subthread/cur/F \ - testdir3/sort/grandchild-promotes-only-subthread/cur/G \ - testdir3/sort/grandchild-promotes-thread/cur/A \ - testdir3/sort/grandchild-promotes-thread/cur/B \ - testdir3/sort/grandchild-promotes-thread/cur/C \ - testdir3/sort/grandchild-promotes-thread/cur/D \ - testdir3/sort/grandchild-promotes-thread/cur/E \ testdir4/1220863087.12663_19.mindcrime!2,S \ testdir4/1220863042.12663_1.mindcrime!2,S \ testdir4/1283599333.1840_11.cthulhu!2, \ diff --git a/lib/testdir3/cycle/cur/cycle0 b/lib/testdir3/cycle/cur/cycle0 deleted file mode 100644 index 67c08ee8..00000000 --- a/lib/testdir3/cycle/cur/cycle0 +++ /dev/null @@ -1,7 +0,0 @@ -From: foo@example.com -To: bar@example.com -Subject: cycle0 -Message-Id: -Date: Tue, 21 Jun 2011 11:00 +0000 - -def diff --git a/lib/testdir3/cycle/cur/cycle0.0 b/lib/testdir3/cycle/cur/cycle0.0 deleted file mode 100644 index 3222a2c3..00000000 --- a/lib/testdir3/cycle/cur/cycle0.0 +++ /dev/null @@ -1,8 +0,0 @@ -From: foo@example.com -To: bar@example.com -Subject: cycle0.0 -Message-Id: -References: -Date: Tue, 21 Jun 2011 12:00 +0000 - -def diff --git a/lib/testdir3/cycle/cur/cycle0.0.0 b/lib/testdir3/cycle/cur/cycle0.0.0 deleted file mode 100644 index 907f3426..00000000 --- a/lib/testdir3/cycle/cur/cycle0.0.0 +++ /dev/null @@ -1,8 +0,0 @@ -From: foo@example.com -To: bar@example.com -Subject: cycle0.0.0 -Message-Id: -References: -Date: Tue, 21 Jun 2011 13:00 +0000 - -def diff --git a/lib/testdir3/cycle/cur/rogue0 b/lib/testdir3/cycle/cur/rogue0 deleted file mode 100644 index 26910709..00000000 --- a/lib/testdir3/cycle/cur/rogue0 +++ /dev/null @@ -1,8 +0,0 @@ -From: foo@example.com -To: bar@example.com -Subject: rogue0 -Message-Id: -References: -Date: Tue, 21 Jun 2011 15:00 +0000 - -def diff --git a/lib/testdir3/cycle/new/.noindex b/lib/testdir3/cycle/new/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/cycle/tmp/.noindex b/lib/testdir3/cycle/tmp/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/1st-child-promotes-thread/cur/A b/lib/testdir3/sort/1st-child-promotes-thread/cur/A deleted file mode 100644 index 85130e80..00000000 --- a/lib/testdir3/sort/1st-child-promotes-thread/cur/A +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: A -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -A diff --git a/lib/testdir3/sort/1st-child-promotes-thread/cur/B b/lib/testdir3/sort/1st-child-promotes-thread/cur/B deleted file mode 100644 index 254aeb72..00000000 --- a/lib/testdir3/sort/1st-child-promotes-thread/cur/B +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: B -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -B diff --git a/lib/testdir3/sort/1st-child-promotes-thread/cur/C b/lib/testdir3/sort/1st-child-promotes-thread/cur/C deleted file mode 100644 index 60b7db56..00000000 --- a/lib/testdir3/sort/1st-child-promotes-thread/cur/C +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: C -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -C diff --git a/lib/testdir3/sort/1st-child-promotes-thread/cur/D b/lib/testdir3/sort/1st-child-promotes-thread/cur/D deleted file mode 100644 index 1e4861df..00000000 --- a/lib/testdir3/sort/1st-child-promotes-thread/cur/D +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: D -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -D diff --git a/lib/testdir3/sort/1st-child-promotes-thread/new/.noindex b/lib/testdir3/sort/1st-child-promotes-thread/new/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/1st-child-promotes-thread/tmp/.noindex b/lib/testdir3/sort/1st-child-promotes-thread/tmp/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/2nd-child-promotes-thread/cur/A b/lib/testdir3/sort/2nd-child-promotes-thread/cur/A deleted file mode 100644 index 85130e80..00000000 --- a/lib/testdir3/sort/2nd-child-promotes-thread/cur/A +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: A -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -A diff --git a/lib/testdir3/sort/2nd-child-promotes-thread/cur/B b/lib/testdir3/sort/2nd-child-promotes-thread/cur/B deleted file mode 100644 index 254aeb72..00000000 --- a/lib/testdir3/sort/2nd-child-promotes-thread/cur/B +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: B -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -B diff --git a/lib/testdir3/sort/2nd-child-promotes-thread/cur/C b/lib/testdir3/sort/2nd-child-promotes-thread/cur/C deleted file mode 100644 index 6d1e19af..00000000 --- a/lib/testdir3/sort/2nd-child-promotes-thread/cur/C +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: C -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -C diff --git a/lib/testdir3/sort/2nd-child-promotes-thread/cur/D b/lib/testdir3/sort/2nd-child-promotes-thread/cur/D deleted file mode 100644 index de61bc13..00000000 --- a/lib/testdir3/sort/2nd-child-promotes-thread/cur/D +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: D -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -D diff --git a/lib/testdir3/sort/2nd-child-promotes-thread/cur/E b/lib/testdir3/sort/2nd-child-promotes-thread/cur/E deleted file mode 100644 index bb7f5f39..00000000 --- a/lib/testdir3/sort/2nd-child-promotes-thread/cur/E +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: E -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -E diff --git a/lib/testdir3/sort/2nd-child-promotes-thread/new/.noindex b/lib/testdir3/sort/2nd-child-promotes-thread/new/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/2nd-child-promotes-thread/tmp/.noindex b/lib/testdir3/sort/2nd-child-promotes-thread/tmp/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/child-does-not-promote-thread/cur/A b/lib/testdir3/sort/child-does-not-promote-thread/cur/A deleted file mode 100644 index c59c42fd..00000000 --- a/lib/testdir3/sort/child-does-not-promote-thread/cur/A +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: A -Message-Id: -References: -In-reply-to: -Aate: Sat, 17 May 2014 10:00:00 +0000 - -A diff --git a/lib/testdir3/sort/child-does-not-promote-thread/cur/X b/lib/testdir3/sort/child-does-not-promote-thread/cur/X deleted file mode 100644 index c8ac3aa2..00000000 --- a/lib/testdir3/sort/child-does-not-promote-thread/cur/X +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: X -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -X diff --git a/lib/testdir3/sort/child-does-not-promote-thread/cur/Y b/lib/testdir3/sort/child-does-not-promote-thread/cur/Y deleted file mode 100644 index ceadc203..00000000 --- a/lib/testdir3/sort/child-does-not-promote-thread/cur/Y +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Y -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -Y diff --git a/lib/testdir3/sort/child-does-not-promote-thread/cur/Z b/lib/testdir3/sort/child-does-not-promote-thread/cur/Z deleted file mode 100644 index 365775b8..00000000 --- a/lib/testdir3/sort/child-does-not-promote-thread/cur/Z +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Z -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -Z diff --git a/lib/testdir3/sort/child-does-not-promote-thread/new/.noindex b/lib/testdir3/sort/child-does-not-promote-thread/new/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/child-does-not-promote-thread/tmp/.noindex b/lib/testdir3/sort/child-does-not-promote-thread/tmp/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/A b/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/A deleted file mode 100644 index 85130e80..00000000 --- a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/A +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: A -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -A diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/B b/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/B deleted file mode 100644 index 254aeb72..00000000 --- a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/B +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: B -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -B diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/C b/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/C deleted file mode 100644 index 6d1e19af..00000000 --- a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/C +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: C -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -C diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/D b/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/D deleted file mode 100644 index 1e4861df..00000000 --- a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/D +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: D -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -D diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/E b/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/E deleted file mode 100644 index bb7f5f39..00000000 --- a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/E +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: E -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -E diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/F b/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/F deleted file mode 100644 index 7c4275d7..00000000 --- a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/F +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: F -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -F diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/G b/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/G deleted file mode 100644 index 4849455f..00000000 --- a/lib/testdir3/sort/grandchild-promotes-only-subthread/cur/G +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: G -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -G diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/new/.noindex b/lib/testdir3/sort/grandchild-promotes-only-subthread/new/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/grandchild-promotes-only-subthread/tmp/.noindex b/lib/testdir3/sort/grandchild-promotes-only-subthread/tmp/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/grandchild-promotes-thread/cur/A b/lib/testdir3/sort/grandchild-promotes-thread/cur/A deleted file mode 100644 index 85130e80..00000000 --- a/lib/testdir3/sort/grandchild-promotes-thread/cur/A +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: A -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -A diff --git a/lib/testdir3/sort/grandchild-promotes-thread/cur/B b/lib/testdir3/sort/grandchild-promotes-thread/cur/B deleted file mode 100644 index 254aeb72..00000000 --- a/lib/testdir3/sort/grandchild-promotes-thread/cur/B +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: B -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -B diff --git a/lib/testdir3/sort/grandchild-promotes-thread/cur/C b/lib/testdir3/sort/grandchild-promotes-thread/cur/C deleted file mode 100644 index 6d1e19af..00000000 --- a/lib/testdir3/sort/grandchild-promotes-thread/cur/C +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: C -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -C diff --git a/lib/testdir3/sort/grandchild-promotes-thread/cur/D b/lib/testdir3/sort/grandchild-promotes-thread/cur/D deleted file mode 100644 index de61bc13..00000000 --- a/lib/testdir3/sort/grandchild-promotes-thread/cur/D +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: D -Message-Id: -Date: Sat, 17 May 2014 10:00:00 +0000 - -D diff --git a/lib/testdir3/sort/grandchild-promotes-thread/cur/E b/lib/testdir3/sort/grandchild-promotes-thread/cur/E deleted file mode 100644 index d605b4b8..00000000 --- a/lib/testdir3/sort/grandchild-promotes-thread/cur/E +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: E -Message-Id: -References: -In-reply-to: -Date: Sat, 17 May 2014 10:00:00 +0000 - -E diff --git a/lib/testdir3/sort/grandchild-promotes-thread/new/.noindex b/lib/testdir3/sort/grandchild-promotes-thread/new/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/sort/grandchild-promotes-thread/tmp/.noindex b/lib/testdir3/sort/grandchild-promotes-thread/tmp/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/tree/cur/child0.0 b/lib/testdir3/tree/cur/child0.0 deleted file mode 100644 index 58da7d68..00000000 --- a/lib/testdir3/tree/cur/child0.0 +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Re: child 0.0 -Message-Id: -References: -In-reply-to: -Date: Tue, 21 Jun 2011 11:10 +0000 - -abc diff --git a/lib/testdir3/tree/cur/child0.1 b/lib/testdir3/tree/cur/child0.1 deleted file mode 100644 index 163fadbd..00000000 --- a/lib/testdir3/tree/cur/child0.1 +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Re: child 0.1 -Message-Id: -References: -In-reply-to: -Date: Tue, 21 Jun 2011 11:20 +0000 - -abc diff --git a/lib/testdir3/tree/cur/child0.1.0 b/lib/testdir3/tree/cur/child0.1.0 deleted file mode 100644 index 40a9eb25..00000000 --- a/lib/testdir3/tree/cur/child0.1.0 +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Re: child 0.1.0 -Message-Id: -References: -In-Reply-To: -Date: Tue, 21 Jun 2011 11:22 +0000 - -abc diff --git a/lib/testdir3/tree/cur/child2.0.0 b/lib/testdir3/tree/cur/child2.0.0 deleted file mode 100644 index 4e4446e9..00000000 --- a/lib/testdir3/tree/cur/child2.0.0 +++ /dev/null @@ -1,12 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Re: child 2.0.0 -Message-Id: -References: -In-Reply-To: -Date: Tue, 21 Jun 2011 15:02 +0000 - -abc - -note, there's no message for 'nonexistant@msg.id', so this msg should -be promoted to level 2.0 diff --git a/lib/testdir3/tree/cur/child3.0.0.0.0 b/lib/testdir3/tree/cur/child3.0.0.0.0 deleted file mode 100644 index 1e2f4abc..00000000 --- a/lib/testdir3/tree/cur/child3.0.0.0.0 +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Re: child 3.0.0.0 -Message-Id: -References: -1n-Reply-To: -Date: Wed, 22 Jun 2011 16:33 +0000 - -abc diff --git a/lib/testdir3/tree/cur/child4.0 b/lib/testdir3/tree/cur/child4.0 deleted file mode 100644 index 7d0ed79f..00000000 --- a/lib/testdir3/tree/cur/child4.0 +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Re: child 4.0 -Message-Id: -References: -In-reply-to: -Date: Tue, 24 Jun 2011 11:10 +0000 - -abc diff --git a/lib/testdir3/tree/cur/child4.1 b/lib/testdir3/tree/cur/child4.1 deleted file mode 100644 index 295d1b13..00000000 --- a/lib/testdir3/tree/cur/child4.1 +++ /dev/null @@ -1,9 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: Re: child 4.1 -Message-Id: -References: -In-reply-to: -Date: Tue, 24 Jun 2011 11:20 +0000 - -abc diff --git a/lib/testdir3/tree/cur/root0 b/lib/testdir3/tree/cur/root0 deleted file mode 100644 index deb64bb1..00000000 --- a/lib/testdir3/tree/cur/root0 +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: root0 -Message-Id: -Date: Tue, 21 Jun 2011 11:00 +0000 - -abc diff --git a/lib/testdir3/tree/cur/root1 b/lib/testdir3/tree/cur/root1 deleted file mode 100644 index fc3efd8e..00000000 --- a/lib/testdir3/tree/cur/root1 +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: root1 -Message-Id: -Date: Tue, 21 Jun 2011 12:00 +0000 - -abc diff --git a/lib/testdir3/tree/cur/root2 b/lib/testdir3/tree/cur/root2 deleted file mode 100644 index 6ba24516..00000000 --- a/lib/testdir3/tree/cur/root2 +++ /dev/null @@ -1,7 +0,0 @@ -From: testfrom@example.com -To: testto@example.com -Subject: root2 -Message-Id: -Date: Tue, 21 Jun 2011 13:00 +0000 - -abc diff --git a/lib/testdir3/tree/new/.noindex b/lib/testdir3/tree/new/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/testdir3/tree/tmp/.noindex b/lib/testdir3/tree/tmp/.noindex deleted file mode 100644 index e69de29b..00000000 diff --git a/mu/Makefile.am b/mu/Makefile.am index 14a8d57f..d2fccabd 100644 --- a/mu/Makefile.am +++ b/mu/Makefile.am @@ -74,7 +74,6 @@ test_cxxflags= \ ${AM_CXXFLAGS} \ -DMU_TESTMAILDIR=\"${abs_top_srcdir}/lib/testdir\" \ -DMU_TESTMAILDIR2=\"${abs_top_srcdir}/lib/testdir2\" \ - -DMU_TESTMAILDIR3=\"${abs_top_srcdir}/lib/testdir3\" \ -DMU_TESTMAILDIR4=\"${abs_top_srcdir}/lib/testdir4\" \ -DMU_PROGRAM=\"${abs_top_builddir}/mu/mu\" \ -DABS_CURDIR=\"${abs_builddir}\" \ @@ -95,11 +94,6 @@ test_cmd_cfind_SOURCES= test-mu-cmd-cfind.cc test_cmd_cfind_CXXFLAGS=$(test_cxxflags) test_cmd_cfind_LDADD=${top_builddir}/lib/libtestmucommon.la $(CODE_COVERAGE_LIBS) -TEST_PROGS += test-threads -test_threads_SOURCES= test-mu-threads.cc -test_threads_CXXFLAGS=$(test_cxxflags) -test_threads_LDADD=${top_builddir}/lib/libtestmucommon.la $(CODE_COVERAGE_LIBS) - TESTS=$(TEST_PROGS) include $(top_srcdir)/aminclude_static.am diff --git a/mu/test-mu-threads.cc b/mu/test-mu-threads.cc deleted file mode 100644 index 7fe115de..00000000 --- a/mu/test-mu-threads.cc +++ /dev/null @@ -1,408 +0,0 @@ -/* -** Copyright (C) 2008-2020 Dirk-Jan C. Binnema -** -** This program is free software; you can redistribute it and/or modify it -** under the terms of the GNU General Public License as published by the -** Free Software Foundation; either version 3, or (at your option) any -** later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software Foundation, -** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -** -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /*HAVE_CONFIG_H*/ - -#include -#include - -#include -#include -#include - -#include "test-mu-common.hh" -#include "mu-query.hh" -#include "utils/mu-str.h" -#include "utils/mu-utils.hh" - -using namespace Mu; - -struct tinfo { - std::string threadpath; - std::string msgid; - std::string subject; -}; - -static void -assert_tinfo_equal (const tinfo& expected, const tinfo& actual) -{ - assert_equal (expected.threadpath, actual.threadpath); - assert_equal (expected.subject, actual.subject); - assert_equal (expected.msgid, actual.msgid); -} - -static void -tinfo_init_from_item (tinfo& item, QueryResults::const_iterator& it) -{ - const auto& qmatch{it.query_match()}; - - item.threadpath = qmatch.thread_path; - item.subject = qmatch.sort_key; - item.msgid = *it.message_id(); - - if (g_test_verbose()) - g_print ("%s %s %s\n", - item.threadpath, item.subject, item.msgid); - -} - -static void -foreach_assert_tinfo_equal (QueryResults& qres, - const tinfo items[], guint n_items) -{ - size_t u{}; - for (auto&& item: qres) { - tinfo ti{}; - tinfo_init_from_item (ti, item); - assert_tinfo_equal (items[u], ti); - ++u; - } - g_assert_cmpuint(u, ==, n_items); -} - -static std::string -make_database (const std::string& testdir) -{ - char *tmpdir{test_mu_common_get_random_tmpdir()}; - const auto cmdline{ - format("/bin/sh -c '" - "%s init --muhome=%s --maildir=%s --quiet ; " - "%s index --muhome=%s --quiet'", - MU_PROGRAM, tmpdir, testdir.c_str(), - MU_PROGRAM, tmpdir)}; - - - if (g_test_verbose()) - g_printerr ("\n%s\n", cmdline.c_str()); - - g_assert (g_spawn_command_line_sync (cmdline.c_str(), NULL, NULL, - NULL, NULL)); - auto xpath= g_strdup_printf ("%s%c%s", tmpdir, G_DIR_SEPARATOR, "xapian"); - g_free (tmpdir); - - std::string dbpath{xpath}; - g_free(xpath); - - return dbpath; -} - - - -/* note: this also *moves the iter* */ -static QueryResults -run_and_get_results_full (const std::string& xpath, const std::string& expr, - MuMsgFieldId sort_field, - Mu::QueryFlags flags=Mu::QueryFlags::None) -{ - Mu::Store store{xpath}; - Mu::Query q{store}; - - const auto myflags{flags | Mu::QueryFlags::Threading}; - auto res{q.run(expr, sort_field, myflags)}; - g_assert(!!res); - - return *res; -} - -static QueryResults -run_and_get_results (const std::string& xpath, const char *query) -{ - return run_and_get_results_full (xpath, query, MU_MSG_FIELD_ID_SUBJECT); -} - -static void -test_mu_threads_01 (void) -{ - const tinfo items [] = { - {"0", "root0@msg.id", "root0"}, - {"0:0", "child0.0@msg.id", "Re: child 0.0"}, - {"0:1", "child0.1@msg.id", "Re: child 0.1"}, - {"0:1:0", "child0.1.0@msg.id", "Re: child 0.1.0"}, - {"1", "root1@msg.id", "root1"}, - {"2", "root2@msg.id", "root2"}, - /* next one's been promoted 2.0.0 => 2.0 */ - {"2:0", "child2.0.0@msg.id", "Re: child 2.0.0"}, - /* next one's been promoted 3.0.0.0.0 => 3 */ - {"3", "child3.0.0.0.0@msg.id", "Re: child 3.0.0.0"}, - - /* two children of absent root 4.0 */ - {"4:0", "child4.0@msg.id", "Re: child 4.0"}, - {"4:1", "child4.1@msg.id", "Re: child 4.1"} - }; - - const auto xpath{make_database(MU_TESTMAILDIR3)}; - g_assert (!xpath.empty()); - - auto qres{run_and_get_results (xpath, "abc")}; - foreach_assert_tinfo_equal (qres, items, G_N_ELEMENTS (items)); -} - -static void -test_mu_threads_rogue (void) -{ - tinfo items1 [] = { - {"0", "cycle0@msg.id", "cycle0"}, - {"0:0", "cycle0.0@msg.id", "cycle0.0"}, - {"0:0:0", "cycle0.0.0@msg.id", "cycle0.0.0"}, - {"0:1", "rogue0@msg.id", "rogue0"}, - }; - - tinfo items2 [] = { - {"0", "cycle0.0@msg.id", "cycle0.0"}, - {"0:0", "cycle0@msg.id", "cycle0"}, - {"0:0:0", "rogue0@msg.id", "rogue0" }, - {"0:1", "cycle0.0.0@msg.id", "cycle0.0.0"} - }; - - const auto xpath{make_database (MU_TESTMAILDIR3)}; - auto res{run_and_get_results (xpath, "def")}; - - /* due to the random order in files can be indexed, there are two possible ways - * for the threads to be built-up; both are okay */ - auto& items = (res.begin().message_id() == "cycle0@msg.id") ? items1 : items2; - - foreach_assert_tinfo_equal (res, items, G_N_ELEMENTS (items1)); -} - -static QueryResults -query_testdir (const std::string& query, MuMsgFieldId sort_field, gboolean descending) -{ - const auto flags{descending ? QueryFlags::Descending : QueryFlags::None}; - const auto xpath{make_database(MU_TESTMAILDIR3)}; - g_assert_false (xpath.empty()); - - auto qres{run_and_get_results_full (xpath, query, sort_field, flags)}; - g_assert_false (qres.empty()); - - return qres; -} - -static void -check_sort_by_subject (const std::string& query, - const tinfo expected[], - guint n_expected, gboolean descending) -{ - - auto qres{query_testdir (query, MU_MSG_FIELD_ID_SUBJECT, descending)}; - foreach_assert_tinfo_equal (qres, expected, n_expected); -} - -static void -check_sort_by_subject_asc (const char *query, const tinfo expected[], - guint n_expected) -{ - check_sort_by_subject (query, expected, n_expected, FALSE); -} - -static void -check_sort_by_subject_desc (const char *query, const tinfo expected[], - guint n_expected) -{ - check_sort_by_subject (query, expected, n_expected, TRUE); -} - -static void -test_mu_threads_sort_1st_child_promotes_thread (void) -{ - const char *query = "maildir:/sort/1st-child-promotes-thread"; - - const tinfo expected_asc [] = { - { "0", "A@msg.id", "A"}, - { "1", "C@msg.id", "C"}, - { "2", "B@msg.id", "B"}, - { "2:0", "D@msg.id", "D"}, - }; - const tinfo expected_desc [] = { - { "0", "B@msg.id", "B"}, - { "0:0", "D@msg.id", "D"}, - { "1", "C@msg.id", "C"}, - { "2", "A@msg.id", "A"}, - }; - - check_sort_by_subject_asc (query, expected_asc, - G_N_ELEMENTS (expected_asc)); - check_sort_by_subject_desc (query, expected_desc, - G_N_ELEMENTS (expected_desc)); -} - -static void -test_mu_threads_sort_2nd_child_promotes_thread (void) -{ - const char *query = "maildir:/sort/2nd-child-promotes-thread"; - - const tinfo expected_asc [] = { - { "0", "A@msg.id", "A"}, - { "1", "D@msg.id", "D"}, - { "2", "B@msg.id", "B"}, - { "2:0", "C@msg.id", "C"}, - { "2:1", "E@msg.id", "E"}, - }; - const tinfo expected_desc [] = { - { "0", "B@msg.id", "B"}, - { "0:0", "C@msg.id", "C"}, - { "0:1", "E@msg.id", "E"}, - { "1", "D@msg.id", "D"}, - { "2", "A@msg.id", "A"}, - }; - - check_sort_by_subject_asc (query, expected_asc, - G_N_ELEMENTS (expected_asc)); - check_sort_by_subject_desc (query, expected_desc, - G_N_ELEMENTS (expected_desc)); -} - -static void -test_mu_threads_sort_orphan_promotes_thread (void) -{ - const char *query = "maildir:/sort/2nd-child-promotes-thread NOT B"; - - /* B lost, C & E orphaned but not promoted */ - const tinfo expected_asc [] = { - { "0", "A@msg.id", "A"}, - { "1", "D@msg.id", "D"}, - { "2:0", "C@msg.id", "C"}, - { "2:1", "E@msg.id", "E"}, - }; - const tinfo expected_desc [] = { - { "0:0", "C@msg.id", "C"}, - { "0:1", "E@msg.id", "E"}, - { "1", "D@msg.id", "D"}, - { "2", "A@msg.id", "A"}, - }; - - check_sort_by_subject_asc (query, expected_asc, - G_N_ELEMENTS (expected_asc)); - check_sort_by_subject_desc (query, expected_desc, - G_N_ELEMENTS (expected_desc)); -} - -/* Won't normally happen when sorting by date. */ -static void -test_mu_threads_sort_child_does_not_promote_thread (void) -{ - const char *query = "maildir:/sort/child-does-not-promote-thread"; - - const tinfo expected_asc [] = { - { "0", "Y@msg.id", "Y"}, - { "0:0", "A@msg.id", "A"}, - { "1", "X@msg.id", "X"}, - { "2", "Z@msg.id", "Z"}, - }; - const tinfo expected_desc [] = { - { "0", "Z@msg.id", "Z"}, - { "1", "X@msg.id", "X"}, - { "2", "Y@msg.id", "Y"}, - { "2:0", "A@msg.id", "A"}, - }; - - check_sort_by_subject_asc (query, expected_asc, - G_N_ELEMENTS (expected_asc)); - check_sort_by_subject_desc (query, expected_desc, - G_N_ELEMENTS (expected_desc)); -} - -static void -test_mu_threads_sort_grandchild_promotes_thread (void) -{ - const char *query = "maildir:/sort/grandchild-promotes-thread"; - - const tinfo expected_asc [] = { - { "0", "A@msg.id", "A"}, - { "1", "D@msg.id", "D"}, - { "2", "B@msg.id", "B"}, - { "2:0", "C@msg.id", "C"}, - { "2:0:0", "E@msg.id", "E"}, - }; - const tinfo expected_desc [] = { - { "0", "B@msg.id", "B"}, - { "0:0", "C@msg.id", "C"}, - { "0:0:0", "E@msg.id", "E"}, - { "1", "D@msg.id", "D"}, - { "2", "A@msg.id", "A"}, - }; - - check_sort_by_subject_asc (query, expected_asc, - G_N_ELEMENTS (expected_asc)); - check_sort_by_subject_desc (query, expected_desc, - G_N_ELEMENTS (expected_desc)); -} - -static void -test_mu_threads_sort_granchild_promotes_only_subthread (void) -{ - const char *query = "maildir:/sort/grandchild-promotes-only-subthread"; - - const tinfo expected_asc [] = { - { "0", "A@msg.id", "A"}, - { "1", "B@msg.id", "B"}, - { "1:0", "C@msg.id", "C"}, - { "1:1", "D@msg.id", "D"}, - { "1:1:0", "F@msg.id", "F"}, - { "1:2", "E@msg.id", "E"}, - { "2", "G@msg.id", "G"}, - }; - const tinfo expected_desc [] = { - { "0", "G@msg.id", "G"}, - { "1", "B@msg.id", "B"}, - { "1:0", "C@msg.id", "C"}, - { "1:1", "D@msg.id", "D"}, - { "1:1:0", "F@msg.id", "F"}, - { "1:2", "E@msg.id", "E"}, - { "2", "A@msg.id", "A"}, - }; - - check_sort_by_subject_asc (query, expected_asc, - G_N_ELEMENTS (expected_asc)); - check_sort_by_subject_desc (query, expected_desc, - G_N_ELEMENTS (expected_desc)); -} -int -main (int argc, char *argv[]) -{ - int rv; - - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/mu-query/test-mu-threads-01", test_mu_threads_01); - g_test_add_func ("/mu-query/test-mu-threads-rogue", test_mu_threads_rogue); - - g_test_add_func ("/mu-query/test-mu-threads-sort-1st-child-promotes-thread", - test_mu_threads_sort_1st_child_promotes_thread); - g_test_add_func ("/mu-query/test-mu-threads-sort-2nd-child-promotes-thread", - test_mu_threads_sort_2nd_child_promotes_thread); - g_test_add_func ("/mu-query/test-mu-threads-orphan-promotes-thread", - test_mu_threads_sort_orphan_promotes_thread); - g_test_add_func ("/mu-query/test-mu-threads-sort-child-does-not-promote-thread", - test_mu_threads_sort_child_does_not_promote_thread); - g_test_add_func ("/mu-query/test-mu-threads-sort-grandchild-promotes-thread", - test_mu_threads_sort_grandchild_promotes_thread); - g_test_add_func ("/mu-query/test-mu-threads-sort-grandchild-promotes-only-subthread", - test_mu_threads_sort_granchild_promotes_only_subthread); - - g_log_set_handler (NULL, - (GLogLevelFlags)(G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| - G_LOG_FLAG_RECURSION), - (GLogFunc)black_hole, NULL); - - rv = g_test_run (); - - return rv; -}