[recipes] Move ingredients test data to a less generic place



commit f6303970360230feb273c165a2bf0f93c69bad5a
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 23 16:26:49 2016 -0500

    Move ingredients test data to a less generic place
    
    We'll add another test that takes data files soon.

 tests/Makefile.am                                 |   10 +++++-----
 tests/{data => ingredients-data}/valid-1.expected |    0
 tests/{data => ingredients-data}/valid-1.in       |    0
 tests/{data => ingredients-data}/valid-2.expected |    0
 tests/{data => ingredients-data}/valid-2.in       |    0
 tests/{data => ingredients-data}/valid-3.expected |    0
 tests/{data => ingredients-data}/valid-3.in       |    0
 tests/{data => ingredients-data}/valid-4.expected |    0
 tests/{data => ingredients-data}/valid-4.in       |    0
 tests/{data => ingredients-data}/valid-5.expected |    0
 tests/{data => ingredients-data}/valid-5.in       |    0
 tests/ingredients.c                               |    4 ++--
 12 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9c6c0a7..41775ca 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,10 +18,10 @@ ingredients_CFLAGS = \
 ingredients_LDADD = $(RECIPES_LIBS)
 
 EXTRA_DIST = \
-       data/valid-1.expected data/valid-1.in   \
-       data/valid-2.expected data/valid-2.in   \
-       data/valid-3.expected data/valid-3.in   \
-       data/valid-4.expected data/valid-4.in   \
-       data/valid-5.expected data/valid-5.in
+       ingredients-data/valid-1.expected ingredients-data/valid-1.in   \
+       ingredients-data/valid-2.expected ingredients-data/valid-2.in   \
+       ingredients-data/valid-3.expected ingredients-data/valid-3.in   \
+       ingredients-data/valid-4.expected ingredients-data/valid-4.in   \
+       ingredients-data/valid-5.expected ingredients-data/valid-5.in
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/data/valid-1.expected b/tests/ingredients-data/valid-1.expected
similarity index 100%
rename from tests/data/valid-1.expected
rename to tests/ingredients-data/valid-1.expected
diff --git a/tests/data/valid-1.in b/tests/ingredients-data/valid-1.in
similarity index 100%
rename from tests/data/valid-1.in
rename to tests/ingredients-data/valid-1.in
diff --git a/tests/data/valid-2.expected b/tests/ingredients-data/valid-2.expected
similarity index 100%
rename from tests/data/valid-2.expected
rename to tests/ingredients-data/valid-2.expected
diff --git a/tests/data/valid-2.in b/tests/ingredients-data/valid-2.in
similarity index 100%
rename from tests/data/valid-2.in
rename to tests/ingredients-data/valid-2.in
diff --git a/tests/data/valid-3.expected b/tests/ingredients-data/valid-3.expected
similarity index 100%
rename from tests/data/valid-3.expected
rename to tests/ingredients-data/valid-3.expected
diff --git a/tests/data/valid-3.in b/tests/ingredients-data/valid-3.in
similarity index 100%
rename from tests/data/valid-3.in
rename to tests/ingredients-data/valid-3.in
diff --git a/tests/data/valid-4.expected b/tests/ingredients-data/valid-4.expected
similarity index 100%
rename from tests/data/valid-4.expected
rename to tests/ingredients-data/valid-4.expected
diff --git a/tests/data/valid-4.in b/tests/ingredients-data/valid-4.in
similarity index 100%
rename from tests/data/valid-4.in
rename to tests/ingredients-data/valid-4.in
diff --git a/tests/data/valid-5.expected b/tests/ingredients-data/valid-5.expected
similarity index 100%
rename from tests/data/valid-5.expected
rename to tests/ingredients-data/valid-5.expected
diff --git a/tests/data/valid-5.in b/tests/ingredients-data/valid-5.in
similarity index 100%
rename from tests/data/valid-5.in
rename to tests/ingredients-data/valid-5.in
diff --git a/tests/ingredients.c b/tests/ingredients.c
index 8db7dfc..802f9c6 100644
--- a/tests/ingredients.c
+++ b/tests/ingredients.c
@@ -128,7 +128,7 @@ int main (int argc, char *argv[])
         }
 
         error = NULL;
-        path = g_test_build_filename (G_TEST_DIST, "data", NULL);
+        path = g_test_build_filename (G_TEST_DIST, "ingredients-data", NULL);
         dir = g_dir_open (path, 0, &error);
         g_free (path);
         g_assert_no_error (error);
@@ -137,7 +137,7 @@ int main (int argc, char *argv[])
                         continue;
 
                 path = g_strdup_printf ("/ingredients/parse/%s", name);
-                g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "data", name, NULL),
+                g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "ingredients-data", 
name, NULL),
                                            test_parse, g_free);
                 g_free (path);
         }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]