From 46ffdf6dca8387a7d7b899567aff1690fd95e737 Mon Sep 17 00:00:00 2001 From: vlm Date: Mon, 23 Jul 2007 06:48:26 +0000 Subject: utilizing new library git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1381 59561ff5-6e30-0410-9f3c-9617f08c8826 --- skeletons/tests/Makefile.am | 1 + skeletons/tests/Makefile.in | 13 ++++------ skeletons/tests/check-GeneralizedTime.c | 39 ++++-------------------------- skeletons/tests/check-INTEGER.c | 14 ++++------- skeletons/tests/check-OCTET_STRING.c | 18 ++++++-------- skeletons/tests/check-OIDs.c | 19 ++++----------- skeletons/tests/check-PER.c | 4 +++- skeletons/tests/check-REAL.c | 19 ++++----------- skeletons/tests/check-UTCTime.c | 42 ++++----------------------------- skeletons/tests/check-UTF8String.c | 14 ++++------- skeletons/tests/check-XER.c | 6 +++-- skeletons/tests/check-ber_tlv_tag.c | 4 +++- skeletons/tests/check-length.c | 21 +++++++---------- 13 files changed, 57 insertions(+), 157 deletions(-) diff --git a/skeletons/tests/Makefile.am b/skeletons/tests/Makefile.am index a664a6f6..fc53663a 100644 --- a/skeletons/tests/Makefile.am +++ b/skeletons/tests/Makefile.am @@ -13,6 +13,7 @@ check_PROGRAMS = \ check-XER \ check-PER +AM_LDFLAGS = $(top_srcdir)/skeletons/libasn1cskeletons.la LDADD = -lm TESTS = $(check_PROGRAMS) diff --git a/skeletons/tests/Makefile.in b/skeletons/tests/Makefile.in index 8d01f365..8a7af24c 100644 --- a/skeletons/tests/Makefile.in +++ b/skeletons/tests/Makefile.in @@ -147,7 +147,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,10 +178,12 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ -YFLAGS = @YFLAGS@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -199,30 +200,23 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -232,6 +226,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ AM_CPPFLAGS = -I$(top_srcdir)/skeletons +AM_LDFLAGS = $(top_srcdir)/skeletons/libasn1cskeletons.la LDADD = -lm TESTS = $(check_PROGRAMS) all: all-am diff --git a/skeletons/tests/check-GeneralizedTime.c b/skeletons/tests/check-GeneralizedTime.c index b56fa0b9..63d2e664 100644 --- a/skeletons/tests/check-GeneralizedTime.c +++ b/skeletons/tests/check-GeneralizedTime.c @@ -1,6 +1,8 @@ -#define __ASN_INTERNAL_TEST_MODE__ +#include +#include +#include + #include -#include #include /* for pow(3) */ static void @@ -264,36 +266,3 @@ main(int ac, char **av) { return 0; } -/* - * Dummy function. - */ - -asn_enc_rval_t -OCTET_STRING_encode_der(asn_TYPE_descriptor_t *td, void *ptr, int tag_mode, ber_tlv_tag_t tag, asn_app_consume_bytes_f *cb, void *app_key) { - asn_enc_rval_t erval; - - (void)td; - (void)ptr; - (void)tag_mode; - (void)tag; - (void)cb; - (void)app_key; - - memset(&erval, 0, sizeof(erval)); - return erval; -} - -asn_enc_rval_t -OCTET_STRING_encode_xer_utf8(asn_TYPE_descriptor_t *td, void *ptr, int ilevel, enum xer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { - asn_enc_rval_t erval; - - (void)td; - (void)ptr; - (void)ilevel; - (void)flags; - (void)cb; - (void)app_key; - - memset(&erval, 0, sizeof(erval)); - return erval; -} diff --git a/skeletons/tests/check-INTEGER.c b/skeletons/tests/check-INTEGER.c index fccce287..bacb618e 100644 --- a/skeletons/tests/check-INTEGER.c +++ b/skeletons/tests/check-INTEGER.c @@ -1,13 +1,7 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include static char *shared_scratch_start; diff --git a/skeletons/tests/check-OCTET_STRING.c b/skeletons/tests/check-OCTET_STRING.c index 120e9c81..e03ecf51 100644 --- a/skeletons/tests/check-OCTET_STRING.c +++ b/skeletons/tests/check-OCTET_STRING.c @@ -1,16 +1,12 @@ -#define EMIT_ASN_DEBUG 1 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include +#define EMIT_ASN_DEBUG 1 +#include +#include + enum encoding_type { HEX, BINARY, UTF8 }; static void diff --git a/skeletons/tests/check-OIDs.c b/skeletons/tests/check-OIDs.c index b7fafe0b..7609ed12 100644 --- a/skeletons/tests/check-OIDs.c +++ b/skeletons/tests/check-OIDs.c @@ -1,16 +1,10 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include +#include #include +#include +#include + static int _print(const void *buffer, size_t size, void *app_key) { (void)app_key; @@ -443,6 +437,3 @@ main() { return 0; } -asn_dec_rval_t OCTET_STRING_decode_uper(asn_codec_ctx_t *ctx, asn_TYPE_descriptor_t *td, asn_per_constraints_t *cts, void **sptr, asn_per_data_t *pd) { asn_dec_rval_t rv = { 0, 0 }; (void)ctx; (void)td; (void)cts; (void)sptr; (void)pd; return rv; } - -asn_enc_rval_t OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td, asn_per_constraints_t *cts, void *sptr, asn_per_outp_t *po) { asn_enc_rval_t er = { 0, 0, 0 }; (void)td; (void)cts; (void)sptr; (void)po; return er; } diff --git a/skeletons/tests/check-PER.c b/skeletons/tests/check-PER.c index e0fb72e7..12e700c4 100644 --- a/skeletons/tests/check-PER.c +++ b/skeletons/tests/check-PER.c @@ -1,6 +1,8 @@ -#include +#include #include +#include + static void check_per_decoding() { uint8_t buf[] = { 0xB7, 0x19, 0x2F, 0xEE, 0xAD }; diff --git a/skeletons/tests/check-REAL.c b/skeletons/tests/check-REAL.c index 3a868aaf..f3aff9c7 100644 --- a/skeletons/tests/check-REAL.c +++ b/skeletons/tests/check-REAL.c @@ -1,14 +1,9 @@ +#include +#include +#include + #define EMIT_ASN_DEBUG 1 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include static char reconstructed[2][512]; static int reconstr_lens[2]; @@ -286,7 +281,3 @@ main() { return 0; } - -asn_dec_rval_t OCTET_STRING_decode_uper(asn_codec_ctx_t *ctx, asn_TYPE_descriptor_t *td, asn_per_constraints_t *cts, void **sptr, asn_per_data_t *pd) { asn_dec_rval_t rv = { 0, 0 }; (void)ctx; (void)td; (void)cts; (void)sptr; (void)pd; return rv; } - -asn_enc_rval_t OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td, asn_per_constraints_t *cts, void *sptr, asn_per_outp_t *po) { asn_enc_rval_t er = { 0, 0, 0 }; (void)td; (void)cts; (void)sptr; (void)po; return er; } diff --git a/skeletons/tests/check-UTCTime.c b/skeletons/tests/check-UTCTime.c index 81dde560..e1c25565 100644 --- a/skeletons/tests/check-UTCTime.c +++ b/skeletons/tests/check-UTCTime.c @@ -1,7 +1,9 @@ -#define __ASN_INTERNAL_TEST_MODE__ +#include +#include +#include + #include -#include -#include +#include static void check(char *time_str, time_t sample, int as_gmt) { @@ -58,37 +60,3 @@ main(int ac, char **av) { return 0; } - -/* - * Dummy function. - */ - -asn_enc_rval_t -OCTET_STRING_encode_der(asn_TYPE_descriptor_t *td, void *ptr, int tag_mode, ber_tlv_tag_t tag, asn_app_consume_bytes_f *cb, void *app_key) { - asn_enc_rval_t erval; - - (void)td; - (void)ptr; - (void)tag_mode; - (void)tag; - (void)cb; - (void)app_key; - - memset(&erval, 0, sizeof(erval)); - return erval; -} - -asn_enc_rval_t -OCTET_STRING_encode_xer_utf8(asn_TYPE_descriptor_t *td, void *ptr, int ilevel, enum xer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { - asn_enc_rval_t erval; - - (void)td; - (void)ptr; - (void)ilevel; - (void)flags; - (void)cb; - (void)app_key; - - memset(&erval, 0, sizeof(erval)); - return erval; -} diff --git a/skeletons/tests/check-UTF8String.c b/skeletons/tests/check-UTF8String.c index 8a90b242..64b5d2e1 100644 --- a/skeletons/tests/check-UTF8String.c +++ b/skeletons/tests/check-UTF8String.c @@ -1,15 +1,9 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include +#include + static void check(int expect_length, char *buf, int buflen) { UTF8String_t st; diff --git a/skeletons/tests/check-XER.c b/skeletons/tests/check-XER.c index 6e2f1ce5..82cd0e4a 100644 --- a/skeletons/tests/check-XER.c +++ b/skeletons/tests/check-XER.c @@ -1,7 +1,9 @@ -#include -#include +#include #include +#include +#include + static void check(char *tag, char *name, xer_check_tag_e value) { xer_check_tag_e xct; diff --git a/skeletons/tests/check-ber_tlv_tag.c b/skeletons/tests/check-ber_tlv_tag.c index 98d5c3e3..7553086e 100644 --- a/skeletons/tests/check-ber_tlv_tag.c +++ b/skeletons/tests/check-ber_tlv_tag.c @@ -1,7 +1,9 @@ #include +#include #include -#include +#include +#include struct tag_control_s { int taglen; diff --git a/skeletons/tests/check-length.c b/skeletons/tests/check-length.c index 56ec0db3..8c2b64b7 100644 --- a/skeletons/tests/check-length.c +++ b/skeletons/tests/check-length.c @@ -1,16 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#undef ADVANCE -#undef RETURN -#undef LEFT -#include - +#include +#include + +#include +#include +#include +#include +#include uint8_t *buf; size_t buf_size; -- cgit v1.2.3