GNOME.org
 

[gnome-keyring] Cleaner naming in testing suite.

commit 41a78ce2a9ef32f31b335afd7795d79557c8914c
Author: Stef Walter <stef memberwebs com>
Date:   Tue Jun 8 20:07:02 2010 +0000

    Cleaner naming in testing suite.

 .gitignore                                         |    2 +-
 egg/tests/test-padding.c                           |    2 +-
 egg/tests/unit-test-asn1.c                         |    2 +-
 egg/tests/unit-test-cleanup.c                      |    2 +-
 egg/tests/unit-test-dh.c                           |    2 +-
 egg/tests/unit-test-hex.c                          |    2 +-
 egg/tests/unit-test-oid.c                          |    2 +-
 egg/tests/unit-test-openssl.c                      |    2 +-
 egg/tests/unit-test-secmem.c                       |    2 +-
 egg/tests/unit-test-spawn.c                        |    2 +-
 egg/tests/unit-test-symkey.c                       |    2 +-
 gcr/tests/unit-test-certificate.c                  |    2 +-
 gcr/tests/unit-test-parser.c                       |    2 +-
 gp11/tests/test-gp11-mechanism.c                   |    2 +-
 gp11/tests/unit-test-gp11-attributes.c             |    2 +-
 gp11/tests/unit-test-gp11-crypto.c                 |    2 +-
 gp11/tests/unit-test-gp11-module.c                 |    2 +-
 gp11/tests/unit-test-gp11-object.c                 |    2 +-
 gp11/tests/unit-test-gp11-session.c                |    2 +-
 gp11/tests/unit-test-gp11-slot.c                   |    2 +-
 pkcs11/gkm/tests/test-module.c                     |    2 +-
 pkcs11/gkm/tests/unit-test-attributes.c            |    2 +-
 pkcs11/gkm/tests/unit-test-credential.c            |    2 +-
 pkcs11/gkm/tests/unit-test-data-asn1.c             |    2 +-
 pkcs11/gkm/tests/unit-test-data-der.c              |    2 +-
 pkcs11/gkm/tests/unit-test-data-file.c             |    2 +-
 pkcs11/gkm/tests/unit-test-file-tracker.c          |    2 +-
 pkcs11/gkm/tests/unit-test-memory-store.c          |    2 +-
 pkcs11/gkm/tests/unit-test-object.c                |    2 +-
 pkcs11/gkm/tests/unit-test-secret.c                |    2 +-
 pkcs11/gkm/tests/unit-test-sexp.c                  |    2 +-
 pkcs11/gkm/tests/unit-test-store.c                 |    2 +-
 pkcs11/gkm/tests/unit-test-timer.c                 |    2 +-
 pkcs11/gkm/tests/unit-test-transaction.c           |    2 +-
 pkcs11/roots-store/tests/test-module.c             |    2 +-
 pkcs11/secret-store/tests/test-secret-module.c     |    6 +++---
 .../secret-store/tests/unit-test-secret-binary.c   |    2 +-
 .../tests/unit-test-secret-collection.c            |    2 +-
 .../secret-store/tests/unit-test-secret-compat.c   |    2 +-
 pkcs11/secret-store/tests/unit-test-secret-data.c  |    2 +-
 .../secret-store/tests/unit-test-secret-fields.c   |    2 +-
 pkcs11/secret-store/tests/unit-test-secret-item.c  |    2 +-
 .../secret-store/tests/unit-test-secret-object.c   |    2 +-
 .../secret-store/tests/unit-test-secret-search.c   |    2 +-
 .../secret-store/tests/unit-test-secret-textual.c  |    2 +-
 pkcs11/ssh-store/tests/test-ssh-module.c           |    2 +-
 pkcs11/ssh-store/tests/unit-test-private-key.c     |    2 +-
 pkcs11/ssh-store/tests/unit-test-ssh-openssh.c     |    2 +-
 pkcs11/user-store/tests/test-module.c              |    2 +-
 pkcs11/wrap-layer/tests/test-login-specific.c      |    2 +-
 pkcs11/wrap-layer/tests/test-login-user.c          |    2 +-
 testing/testing.make                               |   12 ++++++------
 ui/tests/unit-test-util.c                          |    2 +-
 53 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 990c679..1707eef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ stamp-*
 Makefile
 Makefile.in
 core
-test-framework.[ch]
+test-suite.[ch]
 run-tests
 *-marshal.[ch]
 .libs
diff --git a/egg/tests/test-padding.c b/egg/tests/test-padding.c
index 8a02c9a..a42729e 100644
--- a/egg/tests/test-padding.c
+++ b/egg/tests/test-padding.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg/egg-padding.h"
 
diff --git a/egg/tests/unit-test-asn1.c b/egg/tests/unit-test-asn1.c
index 1ab3f38..5a4d7dc 100644
--- a/egg/tests/unit-test-asn1.c
+++ b/egg/tests/unit-test-asn1.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg/egg-asn1.h"
 #include "egg/egg-oid.h"
diff --git a/egg/tests/unit-test-cleanup.c b/egg/tests/unit-test-cleanup.c
index cdb50c9..680b22f 100644
--- a/egg/tests/unit-test-cleanup.c
+++ b/egg/tests/unit-test-cleanup.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg/egg-cleanup.h"
 
diff --git a/egg/tests/unit-test-dh.c b/egg/tests/unit-test-dh.c
index 5adba5b..e08d4e8 100644
--- a/egg/tests/unit-test-dh.c
+++ b/egg/tests/unit-test-dh.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg-dh.h"
 #include "egg-secure-memory.h"
diff --git a/egg/tests/unit-test-hex.c b/egg/tests/unit-test-hex.c
index 5088f2f..adc2b9d 100644
--- a/egg/tests/unit-test-hex.c
+++ b/egg/tests/unit-test-hex.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg-hex.h"
 
diff --git a/egg/tests/unit-test-oid.c b/egg/tests/unit-test-oid.c
index bebd1a1..7d9c4e2 100644
--- a/egg/tests/unit-test-oid.c
+++ b/egg/tests/unit-test-oid.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg/egg-oid.h"
 
diff --git a/egg/tests/unit-test-openssl.c b/egg/tests/unit-test-openssl.c
index 256fa2b..29f4474 100644
--- a/egg/tests/unit-test-openssl.c
+++ b/egg/tests/unit-test-openssl.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg-symkey.h"
 #include "egg-openssl.h"
diff --git a/egg/tests/unit-test-secmem.c b/egg/tests/unit-test-secmem.c
index 8e0cf55..7afd649 100644
--- a/egg/tests/unit-test-secmem.c
+++ b/egg/tests/unit-test-secmem.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg/egg-secure-memory.h"
 
diff --git a/egg/tests/unit-test-spawn.c b/egg/tests/unit-test-spawn.c
index 2e53b53..29c4d7c 100644
--- a/egg/tests/unit-test-spawn.c
+++ b/egg/tests/unit-test-spawn.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg-spawn.h"
 
diff --git a/egg/tests/unit-test-symkey.c b/egg/tests/unit-test-symkey.c
index bf35dca..89313f5 100644
--- a/egg/tests/unit-test-symkey.c
+++ b/egg/tests/unit-test-symkey.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg-libgcrypt.h"
 #include "egg-secure-memory.h"
diff --git a/gcr/tests/unit-test-certificate.c b/gcr/tests/unit-test-certificate.c
index 709f944..2fc5b36 100644
--- a/gcr/tests/unit-test-certificate.c
+++ b/gcr/tests/unit-test-certificate.c
@@ -1,6 +1,6 @@
 
 #include "config.h"
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gcr-certificate.h"
 #include "gcr-simple-certificate.h"
diff --git a/gcr/tests/unit-test-parser.c b/gcr/tests/unit-test-parser.c
index 1359e9d..7d4027b 100644
--- a/gcr/tests/unit-test-parser.c
+++ b/gcr/tests/unit-test-parser.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "egg/egg-error.h"
 #include "egg/egg-secure-memory.h"
diff --git a/gp11/tests/test-gp11-mechanism.c b/gp11/tests/test-gp11-mechanism.c
index 23eeddb..2e12984 100644
--- a/gp11/tests/test-gp11-mechanism.c
+++ b/gp11/tests/test-gp11-mechanism.c
@@ -2,7 +2,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "gp11-test.h"
 
 #define MECH_TYPE 55
diff --git a/gp11/tests/unit-test-gp11-attributes.c b/gp11/tests/unit-test-gp11-attributes.c
index 78cd265..000a8c0 100644
--- a/gp11/tests/unit-test-gp11-attributes.c
+++ b/gp11/tests/unit-test-gp11-attributes.c
@@ -2,7 +2,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "gp11-test.h"
 
 #define ATTR_TYPE 55
diff --git a/gp11/tests/unit-test-gp11-crypto.c b/gp11/tests/unit-test-gp11-crypto.c
index c0581a6..3b12b2e 100644
--- a/gp11/tests/unit-test-gp11-crypto.c
+++ b/gp11/tests/unit-test-gp11-crypto.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include <glib.h>
 
diff --git a/gp11/tests/unit-test-gp11-module.c b/gp11/tests/unit-test-gp11-module.c
index 0a5bda9..ddba8ad 100644
--- a/gp11/tests/unit-test-gp11-module.c
+++ b/gp11/tests/unit-test-gp11-module.c
@@ -2,7 +2,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "gp11-test.h"
 
 static GP11Module *module = NULL;
diff --git a/gp11/tests/unit-test-gp11-object.c b/gp11/tests/unit-test-gp11-object.c
index 6495973..a7e512d 100644
--- a/gp11/tests/unit-test-gp11-object.c
+++ b/gp11/tests/unit-test-gp11-object.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include <glib.h>
 
diff --git a/gp11/tests/unit-test-gp11-session.c b/gp11/tests/unit-test-gp11-session.c
index 19cb11f..79dc650 100644
--- a/gp11/tests/unit-test-gp11-session.c
+++ b/gp11/tests/unit-test-gp11-session.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include <glib.h>
 
diff --git a/gp11/tests/unit-test-gp11-slot.c b/gp11/tests/unit-test-gp11-slot.c
index 90eb6cd..a26ecc1 100644
--- a/gp11/tests/unit-test-gp11-slot.c
+++ b/gp11/tests/unit-test-gp11-slot.c
@@ -2,7 +2,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "gp11-test.h"
 
 static GP11Module *module = NULL;
diff --git a/pkcs11/gkm/tests/test-module.c b/pkcs11/gkm/tests/test-module.c
index 6a7a7d0..20acca6 100644
--- a/pkcs11/gkm/tests/test-module.c
+++ b/pkcs11/gkm/tests/test-module.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "test-module.h"
-#include "test-framework.h"
+#include "test-suite.h"
 
 /* Include all the module entry points */
 #include "gkm/gkm-module-ep.h"
diff --git a/pkcs11/gkm/tests/unit-test-attributes.c b/pkcs11/gkm/tests/unit-test-attributes.c
index 9a86c1b..a60ab64 100644
--- a/pkcs11/gkm/tests/unit-test-attributes.c
+++ b/pkcs11/gkm/tests/unit-test-attributes.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-attributes.h"
 
diff --git a/pkcs11/gkm/tests/unit-test-credential.c b/pkcs11/gkm/tests/unit-test-credential.c
index f40d7e5..0d17bed 100644
--- a/pkcs11/gkm/tests/unit-test-credential.c
+++ b/pkcs11/gkm/tests/unit-test-credential.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-module.h"
 #include "mock-locked-object.h"
 
diff --git a/pkcs11/gkm/tests/unit-test-data-asn1.c b/pkcs11/gkm/tests/unit-test-data-asn1.c
index ba5b542..a7b6021 100644
--- a/pkcs11/gkm/tests/unit-test-data-asn1.c
+++ b/pkcs11/gkm/tests/unit-test-data-asn1.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-data-asn1.h"
 
diff --git a/pkcs11/gkm/tests/unit-test-data-der.c b/pkcs11/gkm/tests/unit-test-data-der.c
index bb7054f..405547c 100644
--- a/pkcs11/gkm/tests/unit-test-data-der.c
+++ b/pkcs11/gkm/tests/unit-test-data-der.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-crypto.h"
 #include "gkm/gkm-data-asn1.h"
diff --git a/pkcs11/gkm/tests/unit-test-data-file.c b/pkcs11/gkm/tests/unit-test-data-file.c
index 48b1097..d4dd10a 100644
--- a/pkcs11/gkm/tests/unit-test-data-file.c
+++ b/pkcs11/gkm/tests/unit-test-data-file.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-data-file.h"
 #include "gkm/gkm-object.h"
diff --git a/pkcs11/gkm/tests/unit-test-file-tracker.c b/pkcs11/gkm/tests/unit-test-file-tracker.c
index 9d88aa4..514c3a2 100644
--- a/pkcs11/gkm/tests/unit-test-file-tracker.c
+++ b/pkcs11/gkm/tests/unit-test-file-tracker.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-file-tracker.h"
 
diff --git a/pkcs11/gkm/tests/unit-test-memory-store.c b/pkcs11/gkm/tests/unit-test-memory-store.c
index c7814ba..9d36ad1 100644
--- a/pkcs11/gkm/tests/unit-test-memory-store.c
+++ b/pkcs11/gkm/tests/unit-test-memory-store.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-module.h"
 
 #include "gkm/gkm-object.h"
diff --git a/pkcs11/gkm/tests/unit-test-object.c b/pkcs11/gkm/tests/unit-test-object.c
index efe1115..6f0a96c 100644
--- a/pkcs11/gkm/tests/unit-test-object.c
+++ b/pkcs11/gkm/tests/unit-test-object.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-module.h"
 
 #include "gkm/gkm-attributes.h"
diff --git a/pkcs11/gkm/tests/unit-test-secret.c b/pkcs11/gkm/tests/unit-test-secret.c
index d8e6ebe..b261272 100644
--- a/pkcs11/gkm/tests/unit-test-secret.c
+++ b/pkcs11/gkm/tests/unit-test-secret.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-secret.h"
 
diff --git a/pkcs11/gkm/tests/unit-test-sexp.c b/pkcs11/gkm/tests/unit-test-sexp.c
index 2253e71..cc14050 100644
--- a/pkcs11/gkm/tests/unit-test-sexp.c
+++ b/pkcs11/gkm/tests/unit-test-sexp.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-crypto.h"
 #include "gkm/gkm-sexp.h"
diff --git a/pkcs11/gkm/tests/unit-test-store.c b/pkcs11/gkm/tests/unit-test-store.c
index 23db8a5..074d283 100644
--- a/pkcs11/gkm/tests/unit-test-store.c
+++ b/pkcs11/gkm/tests/unit-test-store.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-module.h"
 
 #include "gkm/gkm-store.h"
diff --git a/pkcs11/gkm/tests/unit-test-timer.c b/pkcs11/gkm/tests/unit-test-timer.c
index 0159a55..f0303f4 100644
--- a/pkcs11/gkm/tests/unit-test-timer.c
+++ b/pkcs11/gkm/tests/unit-test-timer.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-module.h"
 
 #include "gkm/gkm-timer.h"
diff --git a/pkcs11/gkm/tests/unit-test-transaction.c b/pkcs11/gkm/tests/unit-test-transaction.c
index 1b2b76f..cc69535 100644
--- a/pkcs11/gkm/tests/unit-test-transaction.c
+++ b/pkcs11/gkm/tests/unit-test-transaction.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-transaction.h"
 
diff --git a/pkcs11/roots-store/tests/test-module.c b/pkcs11/roots-store/tests/test-module.c
index 8431d74..960fb32 100644
--- a/pkcs11/roots-store/tests/test-module.c
+++ b/pkcs11/roots-store/tests/test-module.c
@@ -25,7 +25,7 @@
 
 #include "roots-store/gkm-roots-store.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 DEFINE_EXTERNAL(roots_module)
 {
diff --git a/pkcs11/secret-store/tests/test-secret-module.c b/pkcs11/secret-store/tests/test-secret-module.c
index e145b60..30dd342 100644
--- a/pkcs11/secret-store/tests/test-secret-module.c
+++ b/pkcs11/secret-store/tests/test-secret-module.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "test-secret-module.h"
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-secret.h"
 #include "gkm/gkm-module.h"
@@ -213,10 +213,10 @@ test_secret_collection_validate (GkmSecretCollection *collection, GkmSecretData
 	/* "Invalid ACL" */
 	g_assert (ac && ac->application);
 	/* "Invalid ACL Path" */
-	g_assert (ac->application->pathname && strstr (ac->application->pathname, "test-framework"));
+	g_assert (ac->application->pathname && strstr (ac->application->pathname, "test-suite"));
 	/* "Invalid ACL Display Name" */
 	g_assert (ac->application->display_name);
-	g_assert_cmpstr (ac->application->display_name, ==, "test-framework");
+	g_assert_cmpstr (ac->application->display_name, ==, "test-suite");
 	/* "Invalid ACL Access Type" */
 	g_assert_cmpint (ac->types_allowed, ==, (GNOME_KEYRING_ACCESS_READ | GNOME_KEYRING_ACCESS_WRITE | GNOME_KEYRING_ACCESS_REMOVE));
 #endif
diff --git a/pkcs11/secret-store/tests/unit-test-secret-binary.c b/pkcs11/secret-store/tests/unit-test-secret-binary.c
index 7b9c359..de38ccc 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-binary.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-binary.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-secret-module.h"
 
 #include "gkm-secret-binary.h"
diff --git a/pkcs11/secret-store/tests/unit-test-secret-collection.c b/pkcs11/secret-store/tests/unit-test-secret-collection.c
index 533d1a2..33a0761 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-collection.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-collection.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-secret-module.h"
 
 #include "gkm-secret-data.h"
diff --git a/pkcs11/secret-store/tests/unit-test-secret-compat.c b/pkcs11/secret-store/tests/unit-test-secret-compat.c
index ade7a3d..9f26755 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-compat.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-compat.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm-secret-compat.h"
 
diff --git a/pkcs11/secret-store/tests/unit-test-secret-data.c b/pkcs11/secret-store/tests/unit-test-secret-data.c
index c8c9775..b9bc330 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-data.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-data.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm-secret-data.h"
 
diff --git a/pkcs11/secret-store/tests/unit-test-secret-fields.c b/pkcs11/secret-store/tests/unit-test-secret-fields.c
index 454c2a9..7f58c71 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-fields.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-fields.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm-secret-fields.h"
 
diff --git a/pkcs11/secret-store/tests/unit-test-secret-item.c b/pkcs11/secret-store/tests/unit-test-secret-item.c
index 0ac53eb..1430224 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-item.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-item.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-secret-module.h"
 
 #include "gkm-secret-collection.h"
diff --git a/pkcs11/secret-store/tests/unit-test-secret-object.c b/pkcs11/secret-store/tests/unit-test-secret-object.c
index 7c7f589..ea809ea 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-object.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-object.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-secret-module.h"
 
 #include "gkm-secret-object.h"
diff --git a/pkcs11/secret-store/tests/unit-test-secret-search.c b/pkcs11/secret-store/tests/unit-test-secret-search.c
index 99d1337..91d5402 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-search.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-search.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-secret-module.h"
 
 #include "gkm-secret-collection.h"
diff --git a/pkcs11/secret-store/tests/unit-test-secret-textual.c b/pkcs11/secret-store/tests/unit-test-secret-textual.c
index 2493aed..25231bd 100644
--- a/pkcs11/secret-store/tests/unit-test-secret-textual.c
+++ b/pkcs11/secret-store/tests/unit-test-secret-textual.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-secret-module.h"
 
 #include "gkm-secret-collection.h"
diff --git a/pkcs11/ssh-store/tests/test-ssh-module.c b/pkcs11/ssh-store/tests/test-ssh-module.c
index 03910d6..d63baf7 100644
--- a/pkcs11/ssh-store/tests/test-ssh-module.c
+++ b/pkcs11/ssh-store/tests/test-ssh-module.c
@@ -28,7 +28,7 @@
 
 #include "ssh-store/gkm-ssh-store.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 static GMutex *mutex = NULL;
 
diff --git a/pkcs11/ssh-store/tests/unit-test-private-key.c b/pkcs11/ssh-store/tests/unit-test-private-key.c
index f74783e..aab6878 100644
--- a/pkcs11/ssh-store/tests/unit-test-private-key.c
+++ b/pkcs11/ssh-store/tests/unit-test-private-key.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 #include "test-ssh-module.h"
 
 #include "gkm/gkm-credential.h"
diff --git a/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c b/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c
index 3ead3d9..ff81651 100644
--- a/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c
+++ b/pkcs11/ssh-store/tests/unit-test-ssh-openssh.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm-ssh-openssh.h"
 
diff --git a/pkcs11/user-store/tests/test-module.c b/pkcs11/user-store/tests/test-module.c
index b99369e..ee71b7e 100644
--- a/pkcs11/user-store/tests/test-module.c
+++ b/pkcs11/user-store/tests/test-module.c
@@ -25,7 +25,7 @@
 
 #include "user-store/gkm-user-store.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 DEFINE_EXTERNAL(user_module)
 {
diff --git a/pkcs11/wrap-layer/tests/test-login-specific.c b/pkcs11/wrap-layer/tests/test-login-specific.c
index 335f535..ce97e38 100644
--- a/pkcs11/wrap-layer/tests/test-login-specific.c
+++ b/pkcs11/wrap-layer/tests/test-login-specific.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-test.h"
 
diff --git a/pkcs11/wrap-layer/tests/test-login-user.c b/pkcs11/wrap-layer/tests/test-login-user.c
index 0002c9e..46a96ef 100644
--- a/pkcs11/wrap-layer/tests/test-login-user.c
+++ b/pkcs11/wrap-layer/tests/test-login-user.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gkm/gkm-test.h"
 
diff --git a/testing/testing.make b/testing/testing.make
index 3266e50..7c44ced 100644
--- a/testing/testing.make
+++ b/testing/testing.make
@@ -24,13 +24,13 @@ LIBS = \
 noinst_PROGRAMS= \
 	run-tests
 
-test-framework.h: $(TESTING_FILES) Makefile.am $(top_srcdir)/testing/testing-build.sh
-	sh $(top_srcdir)/testing/testing-build.sh -b test-framework $(TESTING_FILES)
+test-suite.h: $(TESTING_FILES) Makefile.am $(top_srcdir)/testing/testing-build.sh
+	sh $(top_srcdir)/testing/testing-build.sh -b test-suite $(TESTING_FILES)
 
-test-framework.c: test-framework.h
+test-suite.c: test-suite.h
 
 run_tests_SOURCES = \
-	test-framework.c test-framework.h \
+	test-suite.c test-suite.h \
 	$(TESTING_FILES)
 
 run_tests_LDADD = \
@@ -45,8 +45,8 @@ run_tests_LDFLAGS = \
 	$(GCOV_LDFLAGS)
 
 BUILT_SOURCES = \
-	test-framework.c \
-	test-framework.h
+	test-suite.c \
+	test-suite.h
 
 # ------------------------------------------------------------------------------
 # Run the tests
diff --git a/ui/tests/unit-test-util.c b/ui/tests/unit-test-util.c
index af0f084..1752d4c 100644
--- a/ui/tests/unit-test-util.c
+++ b/ui/tests/unit-test-util.c
@@ -21,7 +21,7 @@
    Author: Stef Walter <stef memberwebs com>
 */
 
-#include "test-framework.h"
+#include "test-suite.h"
 
 #include "gku-prompt-util.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]