From c46024cfdafbeab86859d8bb00cbc4abd976ff79 Mon Sep 17 00:00:00 2001 From: djcb Date: Sat, 15 Sep 2012 18:03:58 +0300 Subject: [PATCH] * mu/tests: use absolute paths; speed up mu cfind tests --- mu/tests/Makefile.am | 24 ++++++------- mu/tests/test-mu-cmd-cfind.c | 67 +++++++++++------------------------- 2 files changed, 32 insertions(+), 59 deletions(-) diff --git a/mu/tests/Makefile.am b/mu/tests/Makefile.am index 5df9b8f4..f6123257 100644 --- a/mu/tests/Makefile.am +++ b/mu/tests/Makefile.am @@ -16,18 +16,18 @@ include $(top_srcdir)/gtest.mk -INCLUDES=$(XAPIAN_CXXFLAGS) \ - $(GMIME_CFLAGS) \ - $(GLIB_CFLAGS) \ - -I ${top_srcdir} \ - -I ${top_srcdir}/lib \ - -I ${top_srcdir}/lib/tests \ - -DMU_TESTMAILDIR=\"${top_srcdir}/lib/tests/testdir\" \ - -DMU_TESTMAILDIR2=\"${top_srcdir}/lib/tests/testdir2\" \ - -DMU_TESTMAILDIR3=\"${top_srcdir}/lib/tests/testdir3\" \ - -DMU_TESTMAILDIR4=\"${top_srcdir}/lib/tests/testdir4\" \ - -DMU_PROGRAM=\"${abs_top_builddir}/mu/mu\" \ - -DABS_CURDIR=\"${abs_builddir}\" \ +INCLUDES=$(XAPIAN_CXXFLAGS) \ + $(GMIME_CFLAGS) \ + $(GLIB_CFLAGS) \ + -I ${top_srcdir} \ + -I ${top_srcdir}/lib \ + -I ${top_srcdir}/lib/tests \ + -DMU_TESTMAILDIR=\"${abs_top_srcdir}/lib/tests/testdir\" \ + -DMU_TESTMAILDIR2=\"${abs_top_srcdir}/lib/tests/testdir2\" \ + -DMU_TESTMAILDIR3=\"${abs_top_srcdir}/lib/tests/testdir3\" \ + -DMU_TESTMAILDIR4=\"${abs_top_srcdir}/lib/tests/testdir4\" \ + -DMU_PROGRAM=\"${abs_top_builddir}/mu/mu\" \ + -DABS_CURDIR=\"${abs_builddir}\" \ -DABS_SRCDIR=\"${abs_srcdir}\" # don't use -Werror, as it might break on other compilers diff --git a/mu/tests/test-mu-cmd-cfind.c b/mu/tests/test-mu-cmd-cfind.c index 19dd127c..904be3da 100644 --- a/mu/tests/test-mu-cmd-cfind.c +++ b/mu/tests/test-mu-cmd-cfind.c @@ -34,7 +34,7 @@ #include "test-mu-common.h" #include "mu-store.h" - +static gchar *CONTACTS_CACHE = NULL; static gchar* fill_contacts_cache (void) @@ -64,18 +64,14 @@ fill_contacts_cache (void) static void test_mu_cfind_plain (void) { - gchar *muhome, *cmdline, *output, *erroutput; - - muhome = fill_contacts_cache (); - g_assert (muhome != NULL); + gchar *cmdline, *output, *erroutput; cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=plain " "'testmu\\.xxx?'", - MU_PROGRAM, muhome); + MU_PROGRAM, CONTACTS_CACHE); if (g_test_verbose()) g_print ("%s\n", cmdline); - output = erroutput = NULL; g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, NULL, NULL)); @@ -93,7 +89,6 @@ test_mu_cfind_plain (void) "Mü testmu@testmu.xx\n" "Helmut Kröger hk@testmu.xxx\n"); g_free (cmdline); - g_free (muhome); g_free (output); g_free (erroutput); } @@ -101,7 +96,7 @@ test_mu_cfind_plain (void) static void test_mu_cfind_bbdb (void) { - gchar *muhome, *cmdline, *output, *erroutput, *expected; + gchar *cmdline, *output, *erroutput, *expected; gchar today[12]; const char* frm1; const char *frm2; @@ -109,14 +104,11 @@ test_mu_cfind_bbdb (void) time_t now; const char *old_tz; - muhome = fill_contacts_cache (); - g_assert (muhome != NULL); - old_tz = set_tz ("Europe/Helsinki"); cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=bbdb " "'testmu\\.xxx?'", - MU_PROGRAM, muhome); + MU_PROGRAM, CONTACTS_CACHE); output = erroutput = NULL; g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, @@ -155,7 +147,6 @@ test_mu_cfind_bbdb (void) g_assert_cmpstr (output, ==, expected); g_free (cmdline); - g_free (muhome); g_free (output); g_free (erroutput); g_free (expected); @@ -167,14 +158,11 @@ test_mu_cfind_bbdb (void) static void test_mu_cfind_wl (void) { - gchar *muhome, *cmdline, *output, *erroutput; - - muhome = fill_contacts_cache (); - g_assert (muhome != NULL); + gchar *cmdline, *output, *erroutput; cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=wl " "'testmu\\.xxx?'", - MU_PROGRAM, muhome); + MU_PROGRAM, CONTACTS_CACHE); output = erroutput = NULL; g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, @@ -193,7 +181,6 @@ test_mu_cfind_wl (void) "hk@testmu.xxx \"HelmutK\" \"Helmut Kröger\"\n"); g_free (cmdline); - g_free (muhome); g_free (output); g_free (erroutput); } @@ -202,14 +189,11 @@ test_mu_cfind_wl (void) static void test_mu_cfind_mutt_alias (void) { - gchar *muhome, *cmdline, *output, *erroutput; - - muhome = fill_contacts_cache (); - g_assert (muhome != NULL); + gchar *cmdline, *output, *erroutput; cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-alias " "'testmu\\.xxx?'", - MU_PROGRAM, muhome); + MU_PROGRAM, CONTACTS_CACHE); output = erroutput = NULL; g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, @@ -231,7 +215,6 @@ test_mu_cfind_mutt_alias (void) g_free (cmdline); - g_free (muhome); g_free (output); g_free (erroutput); } @@ -239,14 +222,11 @@ test_mu_cfind_mutt_alias (void) static void test_mu_cfind_mutt_ab (void) { - gchar *muhome, *cmdline, *output, *erroutput; - - muhome = fill_contacts_cache (); - g_assert (muhome != NULL); + gchar *cmdline, *output, *erroutput; cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=mutt-ab " "'testmu\\.xxx?'", - MU_PROGRAM, muhome); + MU_PROGRAM, CONTACTS_CACHE); output = erroutput = NULL; g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, @@ -267,7 +247,6 @@ test_mu_cfind_mutt_ab (void) "hk@testmu.xxx\tHelmut Kröger\t\n"); g_free (cmdline); - g_free (muhome); g_free (output); g_free (erroutput); } @@ -276,14 +255,11 @@ test_mu_cfind_mutt_ab (void) static void test_mu_cfind_org_contact (void) { - gchar *muhome, *cmdline, *output, *erroutput; - - muhome = fill_contacts_cache (); - g_assert (muhome != NULL); + gchar*cmdline, *output, *erroutput; cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=org-contact " "'testmu\\.xxx?'", - MU_PROGRAM, muhome); + MU_PROGRAM, CONTACTS_CACHE); output = erroutput = NULL; g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, @@ -316,7 +292,6 @@ test_mu_cfind_org_contact (void) g_free (cmdline); - g_free (muhome); g_free (output); g_free (erroutput); } @@ -326,14 +301,11 @@ test_mu_cfind_org_contact (void) static void test_mu_cfind_csv (void) { - gchar *muhome, *cmdline, *output, *erroutput; - - muhome = fill_contacts_cache (); - g_assert (muhome != NULL); + gchar *cmdline, *output, *erroutput; cmdline = g_strdup_printf ("%s cfind --muhome=%s --format=csv " "'testmu\\.xxx?'", - MU_PROGRAM, muhome); + MU_PROGRAM, CONTACTS_CACHE); output = erroutput = NULL; g_assert (g_spawn_command_line_sync (cmdline, &output, &erroutput, @@ -349,11 +321,7 @@ test_mu_cfind_csv (void) ==, "Mü,testmu@testmu.xx\n" "Helmut Kröger,hk@testmu.xxx\n"); - - - g_free (cmdline); - g_free (muhome); g_free (output); g_free (erroutput); } @@ -368,6 +336,8 @@ main (int argc, char *argv[]) if (!set_en_us_utf8_locale()) return 0; /* don't error out... */ + CONTACTS_CACHE = fill_contacts_cache (); + g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-plain", test_mu_cfind_plain); g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-bbdb", test_mu_cfind_bbdb); g_test_add_func ("/mu-cmd-cfind/test-mu-cfind-wl", test_mu_cfind_wl); @@ -387,5 +357,8 @@ main (int argc, char *argv[]) rv = g_test_run (); + g_free (CONTACTS_CACHE); + CONTACTS_CACHE = NULL; + return rv; }