[pkg-opensc-commit] [pkcs11-helper] 47/60: Examples/tests cleanups

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to tag pkcs11-helper-1.02
in repository pkcs11-helper.

commit db1cf7d345efa18a6c4e92aa3a180914774f8b76
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date:   Wed Dec 20 20:04:00 2006 +0000

    Examples/tests cleanups
---
 configure.ac                                                 |  6 +++---
 include/pkcs11-helper-1.0/pkcs11h-certificate.h              |  6 ++++++
 include/pkcs11-helper-1.0/pkcs11h-core.h                     | 12 ++++++++++++
 tests/Makefile.am                                            |  5 ++++-
 tests/{basic => test-basic}/Makefile.am                      |  2 +-
 tests/{basic => test-basic}/basic.c                          |  0
 tests/{basic/basic.c => test-basic/test-basic.c}             |  0
 tests/{certificate => test-certificate}/Makefile.am          |  2 +-
 tests/{certificate => test-certificate}/certificate.c        |  0
 .../certificate.c => test-certificate/test-certificate.c}    |  0
 tests/{slotevent => test-slotevent}/Makefile.am              |  2 +-
 tests/{slotevent => test-slotevent}/slotevent.c              |  0
 .../slotevent.c => test-slotevent/test-slotevent.c}          |  0
 13 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index f35dde1..9b8ffba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,9 +383,9 @@ AC_CONFIG_FILES([
 	lib/libpkcs11-helper-1.pc
 	m4dir/Makefile
 	tests/Makefile
-	tests/basic/Makefile
-	tests/certificate/Makefile
-	tests/slotevent/Makefile
+	tests/test-basic/Makefile
+	tests/test-certificate/Makefile
+	tests/test-slotevent/Makefile
 ])
 AC_OUTPUT
 
diff --git a/include/pkcs11-helper-1.0/pkcs11h-certificate.h b/include/pkcs11-helper-1.0/pkcs11h-certificate.h
index 41e7a9e..7f3025d 100644
--- a/include/pkcs11-helper-1.0/pkcs11h-certificate.h
+++ b/include/pkcs11-helper-1.0/pkcs11h-certificate.h
@@ -64,6 +64,12 @@
  * @see pkcs11h_certificate.
  */
 
+/**
+ * @example test-certificate.c
+ * 
+ * The following example shows some basic usage of the certificate interface.
+ */
+
 #ifndef __PKCS11H_CERTIFICATE_H
 #define __PKCS11H_CERTIFICATE_H
 
diff --git a/include/pkcs11-helper-1.0/pkcs11h-core.h b/include/pkcs11-helper-1.0/pkcs11h-core.h
index d3d33ae..a558b43 100644
--- a/include/pkcs11-helper-1.0/pkcs11h-core.h
+++ b/include/pkcs11-helper-1.0/pkcs11h-core.h
@@ -104,6 +104,18 @@
  * @see pkcs11h_core.
  */
 
+/**
+ * @example test-basic.c
+ * 
+ * The following example shows some basic usage of the library.
+ */
+
+/**
+ * @example test-slotevent.c
+ * 
+ * The following example shows how to use the slot event interface.
+ */
+
 #ifndef __PKCS11H_BASE_H
 #define __PKCS11H_BASE_H
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 645c9b2..706fd53 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,4 +49,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-SUBDIRS=basic certificate slotevent
+SUBDIRS= \
+	test-basic \
+	test-certificate \
+	test-slotevent
diff --git a/tests/basic/Makefile.am b/tests/test-basic/Makefile.am
similarity index 98%
rename from tests/basic/Makefile.am
rename to tests/test-basic/Makefile.am
index 5a89d95..a6b934f 100644
--- a/tests/basic/Makefile.am
+++ b/tests/test-basic/Makefile.am
@@ -58,4 +58,4 @@ LDADD= \
 
 TESTS=test-basic
 noinst_PROGRAMS=test-basic
-test_basic_SOURCES=basic.c
+test_basic_SOURCES=test-basic.c
diff --git a/tests/basic/basic.c b/tests/test-basic/basic.c
similarity index 100%
copy from tests/basic/basic.c
copy to tests/test-basic/basic.c
diff --git a/tests/basic/basic.c b/tests/test-basic/test-basic.c
similarity index 100%
rename from tests/basic/basic.c
rename to tests/test-basic/test-basic.c
diff --git a/tests/certificate/Makefile.am b/tests/test-certificate/Makefile.am
similarity index 98%
rename from tests/certificate/Makefile.am
rename to tests/test-certificate/Makefile.am
index e85343a..cb75bbe 100644
--- a/tests/certificate/Makefile.am
+++ b/tests/test-certificate/Makefile.am
@@ -58,4 +58,4 @@ LDADD= \
 
 TESTS=test-certificate
 noinst_PROGRAMS=test-certificate
-test_certificate_SOURCES=certificate.c
+test_certificate_SOURCES=test-certificate.c
diff --git a/tests/certificate/certificate.c b/tests/test-certificate/certificate.c
similarity index 100%
copy from tests/certificate/certificate.c
copy to tests/test-certificate/certificate.c
diff --git a/tests/certificate/certificate.c b/tests/test-certificate/test-certificate.c
similarity index 100%
rename from tests/certificate/certificate.c
rename to tests/test-certificate/test-certificate.c
diff --git a/tests/slotevent/Makefile.am b/tests/test-slotevent/Makefile.am
similarity index 98%
rename from tests/slotevent/Makefile.am
rename to tests/test-slotevent/Makefile.am
index b7e817d..a34e977 100644
--- a/tests/slotevent/Makefile.am
+++ b/tests/test-slotevent/Makefile.am
@@ -58,4 +58,4 @@ LDADD= \
 
 TESTS=test-slotevent
 noinst_PROGRAMS=test-slotevent
-test_slotevent_SOURCES=slotevent.c
+test_slotevent_SOURCES=test-slotevent.c
diff --git a/tests/slotevent/slotevent.c b/tests/test-slotevent/slotevent.c
similarity index 100%
copy from tests/slotevent/slotevent.c
copy to tests/test-slotevent/slotevent.c
diff --git a/tests/slotevent/slotevent.c b/tests/test-slotevent/test-slotevent.c
similarity index 100%
rename from tests/slotevent/slotevent.c
rename to tests/test-slotevent/test-slotevent.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git