emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* tests: fix up merge fallout

This commit is contained in:
Dirk-Jan C. Binnema 2011-05-19 22:56:55 +03:00
parent 5e887f8f39
commit d99a814c93
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tests/test-mu-cmd.c
View File

@ -484,13 +484,7 @@ main (int argc, char *argv[])
G_LOG_LEVEL_MASK | G_LOG_LEVEL_WARNING|
G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION,
(GLogFunc)black_hole, NULL);
<<<<<<< HEAD
rv = g_test_run ();
=======
rv = g_test_run ();
>>>>>>> f6ff982e921b60b7afcba19dd85f01d576057f42
return rv;
}

28
src/tests/test-mu-query.c
View File

@ -268,34 +268,6 @@ test_mu_query_06 (void)
}
static void
test_mu_query_06 (void)
{
gchar *xpath;
int i;
QResults queries[] = {
{ "f:mü", 1},
{ "s:motörhead", 1},
{ "t:Helmut", 1},
{ "t:Kröger", 1},
{ "s:MotorHeäD", 1},
{ "queensryche", 1},
{ "Queensrÿche", 1},
};
xpath = fill_database ();
g_assert (xpath != NULL);
for (i = 0; i != G_N_ELEMENTS(queries); ++i)
g_assert_cmpuint (run_and_count_matches (xpath, queries[i].query),
==, queries[i].count);
g_free (xpath);
}
int
main (int argc, char *argv[])
{