[gegl/soc-2012-ville: 9/24] don't require reference directory with testing tool
- From: Ville Sokk <villesokk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl/soc-2012-ville: 9/24] don't require reference directory with testing tool
- Date: Thu, 2 Aug 2012 18:28:34 +0000 (UTC)
commit 1f28555910b2ce1cf1abf5cd7c7ecdea75ccb84f
Author: Ville Sokk <ville sokk gmail com>
Date: Mon Jul 9 19:56:55 2012 +0300
don't require reference directory with testing tool
bin/gegl-tester.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/bin/gegl-tester.c b/bin/gegl-tester.c
index 37d095d..0374102 100644
--- a/bin/gegl-tester.c
+++ b/bin/gegl-tester.c
@@ -248,8 +248,6 @@ main (gint argc,
g_thread_init (NULL);
- reference_dir = g_get_current_dir ();
-
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, options, NULL);
g_option_context_add_group (context, gegl_get_option_group ());
@@ -258,22 +256,26 @@ main (gint argc,
{
g_printf ("%s\n", error->message);
g_error_free (error);
- exit (1);
+ result = FALSE;
}
- else if (!(data_dir && output_dir))
+ else if (output_all && !(data_dir && output_dir))
{
g_printf ("Data and output directories must be specified\n");
- exit (1);
+ result = FALSE;
+ }
+ else if (!(output_all || (data_dir && output_dir && reference_dir)))
+ {
+ g_printf ("Data, reference and output directories must be specified\n");
+ result = FALSE;
}
else
{
regex = g_regex_new (pattern, 0, 0, NULL);
-
result = process_operations (GEGL_TYPE_OPERATION);
-
g_regex_unref (regex);
- gegl_exit ();
-
- return result;
}
+
+ gegl_exit ();
+
+ return result;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]