* crypto: some small updates

This commit is contained in:
djcb
2012-07-18 11:51:21 +03:00
parent fe6333dfef
commit 3c8bc3e68e
5 changed files with 19 additions and 9 deletions

View File

@ -481,7 +481,8 @@ mu_cmd_verify (MuConfig *opts, GError **err)
MuError
mu_cmd_verify (MuConfig *opts, GError **err)
{
g_warning ("Your version of mu does not support crypto");
g_warning ("your version of mu does not support the 'verify' command");
return MU_ERROR_IN_PARAMETERS;
}
#endif /*!BUILD_CRYPTO*/

View File

@ -736,7 +736,7 @@ test_mu_mkdir_01 (void)
/* we can only test 'verify' if gpg is installed, and has
* djcb@djcbsoftware's key in the keyring */
static gboolean
G_GNUC_UNUSED static gboolean
verify_is_testable (void)
{
gchar *gpg, *cmdline;
@ -767,7 +767,7 @@ verify_is_testable (void)
return (rv && retval == 0) ? TRUE:FALSE;
}
static void
G_GNUC_UNUSED static void
test_mu_verify_good (void)
{
gchar *cmdline;
@ -788,7 +788,7 @@ test_mu_verify_good (void)
}
static void
G_GNUC_UNUSED static void
test_mu_verify_bad (void)
{
gchar *cmdline;
@ -854,8 +854,10 @@ main (int argc, char *argv[])
g_test_add_func ("/mu-cmd/test-mu-view-attach", test_mu_view_attach);
g_test_add_func ("/mu-cmd/test-mu-mkdir-01", test_mu_mkdir_01);
#ifdef BUILD_CRYPTO
g_test_add_func ("/mu-cmd/test-mu-verify-good", test_mu_verify_good);
g_test_add_func ("/mu-cmd/test-mu-verify-bad", test_mu_verify_bad);
#endif /*BUILD_CRYPTO*/
g_log_set_handler (NULL,
G_LOG_LEVEL_MASK | G_LOG_LEVEL_WARNING|