testing
diff --git a/skeletons/tests/Makefile.am b/skeletons/tests/Makefile.am
index 4efbcec..b186fe0 100644
--- a/skeletons/tests/Makefile.am
+++ b/skeletons/tests/Makefile.am
@@ -1,9 +1,10 @@
-AM_CPPFLAGS = -I${top_srcdir}/skeletons
+AM_CPPFLAGS = -I$(top_srcdir)/skeletons
check_PROGRAMS = \
+ check-ber_tlv_tag \
check-OIDs \
check-GeneralizedTime \
check-UTCTime \
check-INTEGER
-TESTS = ${check_PROGRAMS}
+TESTS = $(check_PROGRAMS)
diff --git a/skeletons/tests/Makefile.in b/skeletons/tests/Makefile.in
index dbac6f7..57759e9 100644
--- a/skeletons/tests/Makefile.in
+++ b/skeletons/tests/Makefile.in
@@ -13,7 +13,7 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SOURCES = check-GeneralizedTime.c check-INTEGER.c check-OIDs.c check-UTCTime.c
+SOURCES = check-GeneralizedTime.c check-INTEGER.c check-OIDs.c check-UTCTime.c check-ber_tlv_tag.c
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -38,8 +38,9 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-check_PROGRAMS = check-OIDs$(EXEEXT) check-GeneralizedTime$(EXEEXT) \
- check-UTCTime$(EXEEXT) check-INTEGER$(EXEEXT)
+check_PROGRAMS = check-ber_tlv_tag$(EXEEXT) check-OIDs$(EXEEXT) \
+ check-GeneralizedTime$(EXEEXT) check-UTCTime$(EXEEXT) \
+ check-INTEGER$(EXEEXT)
subdir = skeletons/tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -61,13 +62,17 @@
check_UTCTime_SOURCES = check-UTCTime.c
check_UTCTime_OBJECTS = check-UTCTime.$(OBJEXT)
check_UTCTime_LDADD = $(LDADD)
+check_ber_tlv_tag_SOURCES = check-ber_tlv_tag.c
+check_ber_tlv_tag_OBJECTS = check-ber_tlv_tag.$(OBJEXT)
+check_ber_tlv_tag_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/check-GeneralizedTime.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/check-INTEGER.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/check-OIDs.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/check-UTCTime.Po
+@AMDEP_TRUE@ ./$(DEPDIR)/check-UTCTime.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/check-ber_tlv_tag.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
@@ -77,9 +82,9 @@
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = check-GeneralizedTime.c check-INTEGER.c check-OIDs.c \
- check-UTCTime.c
+ check-UTCTime.c check-ber_tlv_tag.c
DIST_SOURCES = check-GeneralizedTime.c check-INTEGER.c check-OIDs.c \
- check-UTCTime.c
+ check-UTCTime.c check-ber_tlv_tag.c
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -193,8 +198,8 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-AM_CPPFLAGS = -I${top_srcdir}/skeletons
-TESTS = ${check_PROGRAMS}
+AM_CPPFLAGS = -I$(top_srcdir)/skeletons
+TESTS = $(check_PROGRAMS)
all: all-am
.SUFFIXES:
@@ -247,6 +252,9 @@
check-UTCTime$(EXEEXT): $(check_UTCTime_OBJECTS) $(check_UTCTime_DEPENDENCIES)
@rm -f check-UTCTime$(EXEEXT)
$(LINK) $(check_UTCTime_LDFLAGS) $(check_UTCTime_OBJECTS) $(check_UTCTime_LDADD) $(LIBS)
+check-ber_tlv_tag$(EXEEXT): $(check_ber_tlv_tag_OBJECTS) $(check_ber_tlv_tag_DEPENDENCIES)
+ @rm -f check-ber_tlv_tag$(EXEEXT)
+ $(LINK) $(check_ber_tlv_tag_LDFLAGS) $(check_ber_tlv_tag_OBJECTS) $(check_ber_tlv_tag_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -258,6 +266,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-INTEGER.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-OIDs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-UTCTime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-ber_tlv_tag.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/skeletons/tests/check-GeneralizedTime.c b/skeletons/tests/check-GeneralizedTime.c
index 65882d4..59474e4 100644
--- a/skeletons/tests/check-GeneralizedTime.c
+++ b/skeletons/tests/check-GeneralizedTime.c
@@ -1,6 +1,6 @@
#define __NO_ASN_TABLE__
-#include "../GeneralizedTime.c"
-#include "../constraints.c"
+#include <GeneralizedTime.c>
+#include <constraints.c>
static void
check(char *time_str, time_t expect, int as_gmt) {
@@ -45,7 +45,7 @@
assert(expect);
printf("[%s] vs [%s] (%d)\n",
gt->buf, expect, force_gmt);
- assert(gt->size == strlen(gt->buf));
+ assert(gt->size == (int)strlen(gt->buf));
assert(!strcmp(gt->buf, expect));
} else {
assert(!expect);
@@ -55,6 +55,8 @@
int
main(int ac, char **av) {
+ (void)av;
+
check("200401250", -1, 0);
check("2004012509300", -1, 0);
check("20040125093000-", -1, 0);
@@ -98,5 +100,13 @@
der_enc_rval_t
OCTET_STRING_encode_der(asn1_TYPE_descriptor_t *td, void *ptr, int tag_mode, ber_tlv_tag_t tag, asn_app_consume_bytes_f *cb, void *app_key) {
der_enc_rval_t erval;
+
+ (void)td;
+ (void)ptr;
+ (void)tag_mode;
+ (void)tag;
+ (void)cb;
+ (void)app_key;
+
return erval;
}
diff --git a/skeletons/tests/check-INTEGER.c b/skeletons/tests/check-INTEGER.c
index 5aa400d..a7edb73 100644
--- a/skeletons/tests/check-INTEGER.c
+++ b/skeletons/tests/check-INTEGER.c
@@ -1,9 +1,9 @@
-#include "../INTEGER.c"
-#include "../ber_decoder.c"
-#include "../ber_tlv_length.c"
-#include "../ber_tlv_tag.c"
-#include "../der_encoder.c"
-#include "../constraints.c"
+#include <INTEGER.c>
+#include <ber_decoder.c>
+#include <ber_tlv_length.c>
+#include <ber_tlv_tag.c>
+#include <der_encoder.c>
+#include <constraints.c>
static char *shared_scratch_start;
diff --git a/skeletons/tests/check-OIDs.c b/skeletons/tests/check-OIDs.c
index 97ed33f..05d34ee 100644
--- a/skeletons/tests/check-OIDs.c
+++ b/skeletons/tests/check-OIDs.c
@@ -1,11 +1,12 @@
-#include "../OBJECT_IDENTIFIER.c"
-#include "../RELATIVE-OID.c"
-#include "../INTEGER.c"
-#include "../ber_decoder.c"
-#include "../ber_tlv_length.c"
-#include "../ber_tlv_tag.c"
-#include "../der_encoder.c"
-#include "../constraints.c"
+#include <OBJECT_IDENTIFIER.c>
+#include <RELATIVE-OID.c>
+#include <INTEGER.c>
+#include <ber_decoder.c>
+#include <ber_tlv_length.c>
+#include <ber_tlv_tag.c>
+#include <der_encoder.c>
+#include <constraints.c>
+
#include <sys/time.h>
static int
diff --git a/skeletons/tests/check-UTCTime.c b/skeletons/tests/check-UTCTime.c
index 99ea4fe..1bd49b3 100644
--- a/skeletons/tests/check-UTCTime.c
+++ b/skeletons/tests/check-UTCTime.c
@@ -1,8 +1,8 @@
#define __NO_ASN_TABLE__
-#include "../UTCTime.c"
+#include <UTCTime.c>
#define __NO_ASSERT_H__
-#include "../GeneralizedTime.c"
-#include "../constraints.c"
+#include <GeneralizedTime.c>
+#include <constraints.c>
static void
check(char *time_str, time_t sample, int as_gmt) {
@@ -35,6 +35,8 @@
int
main(int ac, char **av) {
+ (void)av;
+
check("0401250", -1, 0);
check("0401250930", -1, 0); /* "Z" or "(+|-)hhmm" required */
check("04012509300", -1, 0);
@@ -65,5 +67,13 @@
der_enc_rval_t
OCTET_STRING_encode_der(asn1_TYPE_descriptor_t *td, void *ptr, int tag_mode, ber_tlv_tag_t tag, asn_app_consume_bytes_f *cb, void *app_key) {
der_enc_rval_t erval;
+
+ (void)td;
+ (void)ptr;
+ (void)tag_mode;
+ (void)tag;
+ (void)cb;
+ (void)app_key;
+
return erval;
}