Makefile.am: Move tests into same directories as tested code

This allows for a cleaner build tree, and will provide benefits
when moving to a single Makefile.

24 files changed, 63 insertions, 71 deletions

diff --git a/pkcs11/secret-store/Makefile.am b/pkcs11/secret-store/Makefile.am
index c0dbbbbe..d7cc8bfd 100644
--- a/pkcs11/secret-store/Makefile.am
+++ b/pkcs11/secret-store/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES = \
 	-I$(top_builddir) \
     	-I$(top_srcdir) \
     	-I$(top_srcdir)/pkcs11 \
+	-DSRCDIR="\"@abs_srcdir@\"" \
     	$(GOBJECT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GMODULE_CFLAGS)
@@ -52,5 +53,44 @@ gkm_secret_store_standalone_la_LIBADD = \
 	$(LIBGCRYPT_LIBS)
 
 # -------------------------------------------------------------------------------
+# TESTS
 
-SUBDIRS = . tests
+LDADD = \
+	libgkm-mock-secret-module.a \
+	$(top_builddir)/pkcs11/secret-store/libgkm-secret-store.la \
+	$(top_builddir)/pkcs11/gkm/libgkm.la \
+	$(top_builddir)/egg/libegg.la \
+	$(GLIB_LIBS) \
+	$(LIBGCRYPT_LIBS)
+
+noinst_LIBRARIES = libgkm-mock-secret-module.a
+
+libgkm_mock_secret_module_a_SOURCES = \
+	mock-secret-module.c mock-secret-module.h
+
+noinst_PROGRAMS = dump-keyring0-format
+
+TEST_PROGS = \
+	test-secret-compat \
+	test-secret-fields \
+	test-secret-data \
+	test-secret-object \
+	test-secret-collection \
+	test-secret-item \
+	test-secret-schema \
+	test-secret-search \
+	test-secret-textual \
+	test-secret-binary \
+	test-secret-schema
+
+check_PROGRAMS = $(TEST_PROGS)
+
+test: $(TEST_PROGS)
+	gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(TEST_PROGS)
+
+check-local: test
+
+all-local: $(check_PROGRAMS)
+
+EXTRA_DIST = \
+	fixtures
diff --git a/pkcs11/secret-store/tests/dump-keyring0-format.c b/pkcs11/secret-store/dump-keyring0-format.c
index a459cd33..a459cd33 100644
--- a/pkcs11/secret-store/tests/dump-keyring0-format.c
+++ b/pkcs11/secret-store/dump-keyring0-format.c
diff --git a/pkcs11/secret-store/tests/files/created-on-rhel.keyring b/pkcs11/secret-store/fixtures/created-on-rhel.keyring
index 9df16d11..9df16d11 100644
--- a/pkcs11/secret-store/tests/files/created-on-rhel.keyring
+++ b/pkcs11/secret-store/fixtures/created-on-rhel.keyring
diff --git a/pkcs11/secret-store/tests/files/created-on-solaris-opencsw.keyring b/pkcs11/secret-store/fixtures/created-on-solaris-opencsw.keyring
index 11dbce6e..11dbce6e 100644
--- a/pkcs11/secret-store/tests/files/created-on-solaris-opencsw.keyring
+++ b/pkcs11/secret-store/fixtures/created-on-solaris-opencsw.keyring
diff --git a/pkcs11/secret-store/tests/files/encrypted-with-schema.keyring b/pkcs11/secret-store/fixtures/encrypted-with-schema.keyring
index 63d1a730..63d1a730 100644
--- a/pkcs11/secret-store/tests/files/encrypted-with-schema.keyring
+++ b/pkcs11/secret-store/fixtures/encrypted-with-schema.keyring
diff --git a/pkcs11/secret-store/tests/files/encrypted.keyring b/pkcs11/secret-store/fixtures/encrypted.keyring
index 742aecc3..742aecc3 100644
--- a/pkcs11/secret-store/tests/files/encrypted.keyring
+++ b/pkcs11/secret-store/fixtures/encrypted.keyring
diff --git a/pkcs11/secret-store/tests/files/plain-bad-number.keyring b/pkcs11/secret-store/fixtures/plain-bad-number.keyring
index e5ff5ac9..e5ff5ac9 100644
--- a/pkcs11/secret-store/tests/files/plain-bad-number.keyring
+++ b/pkcs11/secret-store/fixtures/plain-bad-number.keyring
diff --git a/pkcs11/secret-store/tests/files/plain-with-schema.keyring b/pkcs11/secret-store/fixtures/plain-with-schema.keyring
index b2d51cda..b2d51cda 100644
--- a/pkcs11/secret-store/tests/files/plain-with-schema.keyring
+++ b/pkcs11/secret-store/fixtures/plain-with-schema.keyring
diff --git a/pkcs11/secret-store/tests/files/plain.keyring b/pkcs11/secret-store/fixtures/plain.keyring
index c048aa10..c048aa10 100644
--- a/pkcs11/secret-store/tests/files/plain.keyring
+++ b/pkcs11/secret-store/fixtures/plain.keyring
diff --git a/pkcs11/secret-store/tests/files/schema1.keyring b/pkcs11/secret-store/fixtures/schema1.keyring
index 579a8614..579a8614 100644
--- a/pkcs11/secret-store/tests/files/schema1.keyring
+++ b/pkcs11/secret-store/fixtures/schema1.keyring
diff --git a/pkcs11/secret-store/tests/files/schema2.keyring b/pkcs11/secret-store/fixtures/schema2.keyring
index 8c0fcbc4..8c0fcbc4 100644
--- a/pkcs11/secret-store/tests/files/schema2.keyring
+++ b/pkcs11/secret-store/fixtures/schema2.keyring
diff --git a/pkcs11/secret-store/tests/mock-secret-module.c b/pkcs11/secret-store/mock-secret-module.c
index afcda04d..bf6bc96b 100644
--- a/pkcs11/secret-store/tests/mock-secret-module.c
+++ b/pkcs11/secret-store/mock-secret-module.c
@@ -59,8 +59,8 @@ test_secret_module_initialize_and_enter (void)
 	CK_RV rv;
 
 	directory = egg_tests_create_scratch_directory (
-		SRCDIR "/files/encrypted.keyring",
-		SRCDIR "/files/plain.keyring",
+		SRCDIR "/fixtures/encrypted.keyring",
+		SRCDIR "/fixtures/plain.keyring",
 		NULL);
 
 	/* Setup test directory to work in */
diff --git a/pkcs11/secret-store/tests/mock-secret-module.h b/pkcs11/secret-store/mock-secret-module.h
index d577d394..d577d394 100644
--- a/pkcs11/secret-store/tests/mock-secret-module.h
+++ b/pkcs11/secret-store/mock-secret-module.h
diff --git a/pkcs11/secret-store/tests/test-secret-binary.c b/pkcs11/secret-store/test-secret-binary.c
index 0302469e..2900cb45 100644
--- a/pkcs11/secret-store/tests/test-secret-binary.c
+++ b/pkcs11/secret-store/test-secret-binary.c
@@ -99,7 +99,7 @@ test_read_encrypted (Test *test, gconstpointer unused)
 {
 	GkmDataResult res;
 
-	res = check_read_keyring_file (test, SRCDIR "/files/encrypted.keyring");
+	res = check_read_keyring_file (test, SRCDIR "/fixtures/encrypted.keyring");
 	g_assert (res == GKM_DATA_SUCCESS);
 
 	test_secret_collection_validate (test->collection, test->sdata);
@@ -110,7 +110,7 @@ test_read_wrong_format (Test *test, gconstpointer unused)
 {
 	GkmDataResult res;
 
-	res = check_read_keyring_file (test, SRCDIR "/files/plain.keyring");
+	res = check_read_keyring_file (test, SRCDIR "/fixtures/plain.keyring");
 	g_assert (res == GKM_DATA_UNRECOGNIZED);
 }
 
@@ -124,7 +124,7 @@ test_read_wrong_master (Test *test, gconstpointer unused)
 	gkm_secret_data_set_master (test->sdata, master);
 	g_object_unref (master);
 
-	res = check_read_keyring_file (test, SRCDIR "/files/encrypted.keyring");
+	res = check_read_keyring_file (test, SRCDIR "/fixtures/encrypted.keyring");
 	g_assert (res == GKM_DATA_LOCKED);
 }
 
@@ -135,7 +135,7 @@ test_read_sdata_but_no_master (Test *test, gconstpointer unused)
 
 	gkm_secret_data_set_master (test->sdata, NULL);
 
-	res = check_read_keyring_file (test, SRCDIR "/files/encrypted.keyring");
+	res = check_read_keyring_file (test, SRCDIR "/fixtures/encrypted.keyring");
 	g_assert (res == GKM_DATA_LOCKED);
 }
 
@@ -166,7 +166,7 @@ test_remove_unavailable (Test *test, gconstpointer unused)
 	gchar *data;
 	gsize n_data;
 
-	if (!g_file_get_contents (SRCDIR "/files/encrypted.keyring", &data, &n_data, NULL))
+	if (!g_file_get_contents (SRCDIR "/fixtures/encrypted.keyring", &data, &n_data, NULL))
 		g_assert_not_reached ();
 	res = gkm_secret_binary_read (test->collection, test->sdata, data, n_data);
 	g_assert (res == GKM_DATA_SUCCESS);
@@ -206,7 +206,7 @@ test_read_created_on_solaris_opencsw (Test *test, gconstpointer unused)
 	gkm_secret_data_set_master (test->sdata, master);
 	g_object_unref (master);
 
-	res = check_read_keyring_file (test, SRCDIR "/files/created-on-solaris-opencsw.keyring");
+	res = check_read_keyring_file (test, SRCDIR "/fixtures/created-on-solaris-opencsw.keyring");
 	g_assert_cmpint (res, ==, GKM_DATA_SUCCESS);
 }
 
@@ -220,7 +220,7 @@ test_read_created_on_rhel (Test *test, gconstpointer unused)
 	gkm_secret_data_set_master (test->sdata, master);
 	g_object_unref (master);
 
-	res = check_read_keyring_file (test, SRCDIR "/files/created-on-rhel.keyring");
+	res = check_read_keyring_file (test, SRCDIR "/fixtures/created-on-rhel.keyring");
 	g_assert_cmpint (res, ==, GKM_DATA_SUCCESS);
 }
 
@@ -235,7 +235,7 @@ test_read_with_schema (Test *test,
 	master = gkm_secret_new_from_password ("test");
 	gkm_secret_data_set_master (test->sdata, master);
 	g_object_unref (master);
-	res = check_read_keyring_file (test, SRCDIR "/files/encrypted-with-schema.keyring");
+	res = check_read_keyring_file (test, SRCDIR "/fixtures/encrypted-with-schema.keyring");
 	g_assert_cmpint (res, ==, GKM_DATA_SUCCESS);
 
 	item = gkm_secret_collection_get_item (test->collection, "1");
diff --git a/pkcs11/secret-store/tests/test-secret-collection.c b/pkcs11/secret-store/test-secret-collection.c
index 7d6d6702..f9e03940 100644
--- a/pkcs11/secret-store/tests/test-secret-collection.c
+++ b/pkcs11/secret-store/test-secret-collection.c
@@ -171,7 +171,7 @@ test_load_unlock_plain (Test *test, gconstpointer unused)
 	GkmDataResult res;
 	CK_RV rv;
 
-	gkm_secret_collection_set_filename (test->collection, SRCDIR "/files/plain.keyring");
+	gkm_secret_collection_set_filename (test->collection, SRCDIR "/fixtures/plain.keyring");
 
 	/* Load the data in the file */
 	res = gkm_secret_collection_load (test->collection);
@@ -197,7 +197,7 @@ test_load_unlock_encrypted (Test *test, gconstpointer unused)
 	GkmDataResult res;
 	CK_RV rv;
 
-	gkm_secret_collection_set_filename (test->collection, SRCDIR "/files/encrypted.keyring");
+	gkm_secret_collection_set_filename (test->collection, SRCDIR "/fixtures/encrypted.keyring");
 
 	/* Load the data in the file */
 	res = gkm_secret_collection_load (test->collection);
@@ -223,7 +223,7 @@ test_load_unlock_bad_password (Test *test, gconstpointer unused)
 	GkmDataResult res;
 	CK_RV rv;
 
-	gkm_secret_collection_set_filename (test->collection, SRCDIR "/files/encrypted.keyring");
+	gkm_secret_collection_set_filename (test->collection, SRCDIR "/fixtures/encrypted.keyring");
 
 	/* Load the data in the file */
 	res = gkm_secret_collection_load (test->collection);
@@ -242,7 +242,7 @@ test_unlock_without_load (Test *test, gconstpointer unused)
 	GkmSecretData *sdata;
 	CK_RV rv;
 
-	gkm_secret_collection_set_filename (test->collection, SRCDIR "/files/encrypted.keyring");
+	gkm_secret_collection_set_filename (test->collection, SRCDIR "/fixtures/encrypted.keyring");
 
 	/* Unlock the keyring, which should load it */
 	rv = gkm_credential_create (test->module, gkm_session_get_manager (test->session), GKM_OBJECT (test->collection),
@@ -264,7 +264,7 @@ test_twice_unlock (Test *test, gconstpointer unused)
 	GkmSecretData *sdata;
 	CK_RV rv;
 
-	gkm_secret_collection_set_filename (test->collection, SRCDIR "/files/encrypted.keyring");
+	gkm_secret_collection_set_filename (test->collection, SRCDIR "/fixtures/encrypted.keyring");
 
 	/* Unlock the keyring, which should load */
 	rv = gkm_credential_create (test->module, gkm_session_get_manager (test->session), GKM_OBJECT (test->collection),
@@ -293,7 +293,7 @@ test_twice_unlock_bad_password (Test *test, gconstpointer unused)
 	GkmSecretData *sdata;
 	CK_RV rv;
 
-	gkm_secret_collection_set_filename (test->collection, SRCDIR "/files/encrypted.keyring");
+	gkm_secret_collection_set_filename (test->collection, SRCDIR "/fixtures/encrypted.keyring");
 
 	/* Unlock the keyring, which should load */
 	rv = gkm_credential_create (test->module, gkm_session_get_manager (test->session), GKM_OBJECT (test->collection),
diff --git a/pkcs11/secret-store/tests/test-secret-compat.c b/pkcs11/secret-store/test-secret-compat.c
index 2a86ca37..2a86ca37 100644
--- a/pkcs11/secret-store/tests/test-secret-compat.c
+++ b/pkcs11/secret-store/test-secret-compat.c
diff --git a/pkcs11/secret-store/tests/test-secret-data.c b/pkcs11/secret-store/test-secret-data.c
index 62829e0b..62829e0b 100644
--- a/pkcs11/secret-store/tests/test-secret-data.c
+++ b/pkcs11/secret-store/test-secret-data.c
diff --git a/pkcs11/secret-store/tests/test-secret-fields.c b/pkcs11/secret-store/test-secret-fields.c
index 76c520a5..76c520a5 100644
--- a/pkcs11/secret-store/tests/test-secret-fields.c
+++ b/pkcs11/secret-store/test-secret-fields.c
diff --git a/pkcs11/secret-store/tests/test-secret-item.c b/pkcs11/secret-store/test-secret-item.c
index cf5ad88c..cf5ad88c 100644
--- a/pkcs11/secret-store/tests/test-secret-item.c
+++ b/pkcs11/secret-store/test-secret-item.c
diff --git a/pkcs11/secret-store/tests/test-secret-object.c b/pkcs11/secret-store/test-secret-object.c
index 9855c061..9855c061 100644
--- a/pkcs11/secret-store/tests/test-secret-object.c
+++ b/pkcs11/secret-store/test-secret-object.c
diff --git a/pkcs11/secret-store/tests/test-secret-schema.c b/pkcs11/secret-store/test-secret-schema.c
index 123c903f..82fafdd6 100644
--- a/pkcs11/secret-store/tests/test-secret-schema.c
+++ b/pkcs11/secret-store/test-secret-schema.c
@@ -72,7 +72,7 @@ setup (Test *test,
 	 */
 
 	gkm_secret_collection_set_filename (test->collection,
-	                                    SRCDIR "/files/schema1.keyring");
+	                                    SRCDIR "/fixtures/schema1.keyring");
 
 	/* Load the collection */
 	res = gkm_secret_collection_load (test->collection);
diff --git a/pkcs11/secret-store/tests/test-secret-search.c b/pkcs11/secret-store/test-secret-search.c
index 64fb7533..64fb7533 100644
--- a/pkcs11/secret-store/tests/test-secret-search.c
+++ b/pkcs11/secret-store/test-secret-search.c
diff --git a/pkcs11/secret-store/tests/test-secret-textual.c b/pkcs11/secret-store/test-secret-textual.c
index bfd722ae..0752712c 100644
--- a/pkcs11/secret-store/tests/test-secret-textual.c
+++ b/pkcs11/secret-store/test-secret-textual.c
@@ -81,7 +81,7 @@ test_read (Test *test, gconstpointer unused)
 	gchar *data;
 	gsize n_data;
 
-	if (!g_file_get_contents (SRCDIR "/files/plain.keyring", &data, &n_data, NULL))
+	if (!g_file_get_contents (SRCDIR "/fixtures/plain.keyring", &data, &n_data, NULL))
 		g_assert_not_reached ();
 	res = gkm_secret_textual_read (test->collection, test->sdata, data, n_data);
 	g_free (data);
@@ -98,7 +98,7 @@ test_read_wrong_format (Test *test, gconstpointer unused)
 	gchar *data;
 	gsize n_data;
 
-	if (!g_file_get_contents (SRCDIR "/files/encrypted.keyring", &data, &n_data, NULL))
+	if (!g_file_get_contents (SRCDIR "/fixtures/encrypted.keyring", &data, &n_data, NULL))
 		g_assert_not_reached ();
 
 	res = gkm_secret_textual_read (test->collection, test->sdata, data, n_data);
@@ -116,7 +116,7 @@ test_read_bad_number (Test *test, gconstpointer unused)
 	gchar *data;
 	gsize n_data;
 
-	if (!g_file_get_contents (SRCDIR "/files/plain-bad-number.keyring", &data, &n_data, NULL))
+	if (!g_file_get_contents (SRCDIR "/fixtures/plain-bad-number.keyring", &data, &n_data, NULL))
 		g_assert_not_reached ();
 	res = gkm_secret_textual_read (test->collection, test->sdata, data, n_data);
 	g_free (data);
@@ -158,7 +158,7 @@ test_remove_unavailable (Test *test, gconstpointer unused)
 	gchar *data;
 	gsize n_data;
 
-	if (!g_file_get_contents (SRCDIR "/files/plain.keyring", &data, &n_data, NULL))
+	if (!g_file_get_contents (SRCDIR "/fixtures/plain.keyring", &data, &n_data, NULL))
 		g_assert_not_reached ();
 	res = gkm_secret_textual_read (test->collection, test->sdata, data, n_data);
 	g_assert (res == GKM_DATA_SUCCESS);
@@ -197,7 +197,7 @@ test_read_with_schema (Test *test,
 	gchar *data;
 	gsize n_data;
 
-	if (!g_file_get_contents (SRCDIR "/files/plain-with-schema.keyring", &data, &n_data, NULL))
+	if (!g_file_get_contents (SRCDIR "/fixtures/plain-with-schema.keyring", &data, &n_data, NULL))
 		g_assert_not_reached ();
 	res = gkm_secret_textual_read (test->collection, test->sdata, data, n_data);
 	g_assert (res == GKM_DATA_SUCCESS);
diff --git a/pkcs11/secret-store/tests/Makefile.am b/pkcs11/secret-store/tests/Makefile.am
deleted file mode 100644
index 5a77f0f5..00000000
--- a/pkcs11/secret-store/tests/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-INCLUDES = \
-	-I$(top_builddir) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/pkcs11 \
-	-DSRCDIR="\"@abs_srcdir@\"" \
-	$(GLIB_CFLAGS) \
-	$(LIBGCRYPT_CFLAGS)
-
-LDADD = \
-	libgkm-mock-secret-module.a \
-	$(top_builddir)/pkcs11/secret-store/libgkm-secret-store.la \
-	$(top_builddir)/pkcs11/gkm/libgkm.la \
-	$(top_builddir)/egg/libegg.la \
-	$(GLIB_LIBS) \
-	$(LIBGCRYPT_LIBS)
-
-noinst_LIBRARIES = libgkm-mock-secret-module.a
-
-libgkm_mock_secret_module_a_SOURCES = \
-	mock-secret-module.c mock-secret-module.h
-
-noinst_PROGRAMS = dump-keyring0-format
-
-TEST_PROGS = \
-	test-secret-compat \
-	test-secret-fields \
-	test-secret-data \
-	test-secret-object \
-	test-secret-collection \
-	test-secret-item \
-	test-secret-schema \
-	test-secret-search \
-	test-secret-textual \
-	test-secret-binary \
-	test-secret-schema
-
-check_PROGRAMS = $(TEST_PROGS)
-
-test: $(TEST_PROGS)
-	gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(TEST_PROGS)
-
-check-local: test
-
-all-local: $(check_PROGRAMS)
-
-EXTRA_DIST = \
-	files