aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1c/tests/check-src/check-119.-fwide-types.-gen-PER.c10
-rw-r--r--asn1c/tests/check-src/check-119.-gen-PER.c10
-rw-r--r--asn1c/tests/check-src/check-126.-gen-PER.c6
-rw-r--r--asn1c/tests/check-src/check-70.-fwide-types.c4
-rw-r--r--asn1c/tests/check-src/check-70.c4
-rw-r--r--skeletons/tests/Makefile.am3
-rw-r--r--skeletons/tests/Makefile.in2
-rw-r--r--skeletons/tests/check-OCTET_STRING.c1
-rw-r--r--skeletons/tests/check-PER-INTEGER.c1
-rw-r--r--skeletons/tests/check-PER.c7
-rw-r--r--skeletons/tests/check-REAL.c1
11 files changed, 29 insertions, 20 deletions
diff --git a/asn1c/tests/check-src/check-119.-fwide-types.-gen-PER.c b/asn1c/tests/check-src/check-119.-fwide-types.-gen-PER.c
index 8e5c2426..ebfb4f41 100644
--- a/asn1c/tests/check-src/check-119.-fwide-types.-gen-PER.c
+++ b/asn1c/tests/check-src/check-119.-fwide-types.-gen-PER.c
@@ -45,6 +45,7 @@ _buf_writer(const void *buffer, size_t size, void *app_key) {
memcpy(buf + buf_offset, buffer, size);
b = buf + buf_offset;
bend = b + size;
+#ifdef EMIT_ASN_DEBUG
fprintf(stderr, "=> [");
for(; b < bend; b++) {
if(*b >= 32 && *b < 127 && *b != '%')
@@ -53,6 +54,7 @@ _buf_writer(const void *buffer, size_t size, void *app_key) {
fprintf(stderr, "%%%02x", *b);
}
fprintf(stderr, "]:%zd\n", size);
+#endif
buf_offset += size;
return 0;
}
@@ -131,16 +133,18 @@ load_object_from(const char *fname, enum expectation expectation, unsigned char
st = 0;
do {
- fprintf(stderr, "Decoding bytes %d..%d (left %d)\n",
+ ASN_DEBUG("Decoding bytes %d..%d (left %d)",
fbuf_offset,
fbuf_chunk < fbuf_left
? fbuf_chunk : fbuf_left,
fbuf_left);
+#ifdef EMIT_ASN_DEBUG
if(st) {
fprintf(stderr, "=== currently ===\n");
asn_fprint(stderr, &asn_DEF_PDU, st);
fprintf(stderr, "=== end ===\n");
}
+#endif
switch(how) {
case AS_XER:
rval = xer_decode(0, &asn_DEF_PDU, (void **)&st,
@@ -157,9 +161,9 @@ load_object_from(const char *fname, enum expectation expectation, unsigned char
rval.consumed = 0; /* Not restartable */
ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
- fprintf(stderr, "-> PER wants more\n");
+ ASN_DEBUG("-> PER wants more");
} else {
- fprintf(stderr, "-> PER ret %d/%ld\n",
+ ASN_DEBUG("-> PER ret %d/%ld",
rval.code, rval.consumed);
/* uper_decode() returns _bits_ */
rval.consumed += 7;
diff --git a/asn1c/tests/check-src/check-119.-gen-PER.c b/asn1c/tests/check-src/check-119.-gen-PER.c
index a1f2f805..bb52eac3 100644
--- a/asn1c/tests/check-src/check-119.-gen-PER.c
+++ b/asn1c/tests/check-src/check-119.-gen-PER.c
@@ -45,6 +45,7 @@ _buf_writer(const void *buffer, size_t size, void *app_key) {
memcpy(buf + buf_offset, buffer, size);
b = buf + buf_offset;
bend = b + size;
+#ifdef EMIT_ASN_DEBUG
fprintf(stderr, "=> [");
for(; b < bend; b++) {
if(*b >= 32 && *b < 127 && *b != '%')
@@ -53,6 +54,7 @@ _buf_writer(const void *buffer, size_t size, void *app_key) {
fprintf(stderr, "%%%02x", *b);
}
fprintf(stderr, "]:%zd\n", size);
+#endif
buf_offset += size;
return 0;
}
@@ -131,16 +133,18 @@ load_object_from(const char *fname, enum expectation expectation, unsigned char
st = 0;
do {
- fprintf(stderr, "Decoding bytes %d..%d (left %d)\n",
+ ASN_DEBUG("Decoding bytes %d..%d (left %d)",
fbuf_offset,
fbuf_chunk < fbuf_left
? fbuf_chunk : fbuf_left,
fbuf_left);
+#ifdef EMIT_ASN_DEBUG
if(st) {
fprintf(stderr, "=== currently ===\n");
asn_fprint(stderr, &asn_DEF_PDU, st);
fprintf(stderr, "=== end ===\n");
}
+#endif
switch(how) {
case AS_XER:
rval = xer_decode(0, &asn_DEF_PDU, (void **)&st,
@@ -157,9 +161,9 @@ load_object_from(const char *fname, enum expectation expectation, unsigned char
rval.consumed = 0; /* Not restartable */
ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
- fprintf(stderr, "-> PER wants more\n");
+ ASN_DEBUG("-> PER wants more");
} else {
- fprintf(stderr, "-> PER ret %d/%zd\n",
+ ASN_DEBUG("-> PER ret %d/%zd",
rval.code, rval.consumed);
/* uper_decode() returns _bits_ */
rval.consumed += 7;
diff --git a/asn1c/tests/check-src/check-126.-gen-PER.c b/asn1c/tests/check-src/check-126.-gen-PER.c
index 595a1dbf..ca3b34bc 100644
--- a/asn1c/tests/check-src/check-126.-gen-PER.c
+++ b/asn1c/tests/check-src/check-126.-gen-PER.c
@@ -35,6 +35,7 @@ _buf_writer(const void *buffer, size_t size, void *app_key) {
memcpy(buf + buf_offset, buffer, size);
b = buf + buf_offset;
bend = b + size;
+#ifdef EMIT_ASN_DEBUG
fprintf(stderr, "=> [");
for(; b < bend; b++) {
if(*b >= 32 && *b < 127 && *b != '%')
@@ -43,6 +44,7 @@ _buf_writer(const void *buffer, size_t size, void *app_key) {
fprintf(stderr, "%%%02x", *b);
}
fprintf(stderr, "]:%zd\n", size);
+#endif
buf_offset += size;
return 0;
}
@@ -152,10 +154,10 @@ load_object_from(const char *fname, unsigned char *fbuf, size_t size, enum encty
rval.consumed = 0; /* Not restartable */
ASN_STRUCT_FREE(asn_DEF_PDU, st);
st = 0;
- fprintf(stderr, "-> PER wants more\n");
+ ASN_DEBUG("-> PER wants more");
}
} else {
- fprintf(stderr, "-> PER ret %d/%zd mf=%d\n",
+ ASN_DEBUG("-> PER ret %d/%zd mf=%d",
rval.code, rval.consumed, mustfail);
/* uper_decode() returns _bits_ */
rval.consumed += 7;
diff --git a/asn1c/tests/check-src/check-70.-fwide-types.c b/asn1c/tests/check-src/check-70.-fwide-types.c
index 3a42e99a..bd969786 100644
--- a/asn1c/tests/check-src/check-70.-fwide-types.c
+++ b/asn1c/tests/check-src/check-70.-fwide-types.c
@@ -125,16 +125,18 @@ load_object_from(enum expectation expectation, unsigned char *fbuf, size_t size,
st = 0;
do {
- fprintf(stderr, "Decoding bytes %d..%d (left %d)\n",
+ ASN_DEBUG("Decoding bytes %d..%d (left %d)",
fbuf_offset,
fbuf_chunk < fbuf_left
? fbuf_chunk : fbuf_left,
fbuf_left);
+#ifdef EMIT_ASN_DEBUG
if(st) {
fprintf(stderr, "=== currently ===\n");
asn_fprint(stderr, &asn_DEF_PDU, st);
fprintf(stderr, "=== end ===\n");
}
+#endif
rval = zer_decode(0, &asn_DEF_PDU, (void **)&st,
fbuf + fbuf_offset,
fbuf_chunk < fbuf_left
diff --git a/asn1c/tests/check-src/check-70.c b/asn1c/tests/check-src/check-70.c
index d09f095a..d844f08b 100644
--- a/asn1c/tests/check-src/check-70.c
+++ b/asn1c/tests/check-src/check-70.c
@@ -114,16 +114,18 @@ load_object_from(enum expectation expectation, unsigned char *fbuf, size_t size,
st = 0;
do {
- fprintf(stderr, "Decoding bytes %d..%d (left %d)\n",
+ ASN_DEBUG("Decoding bytes %d..%d (left %d)",
fbuf_offset,
fbuf_chunk < fbuf_left
? fbuf_chunk : fbuf_left,
fbuf_left);
+#ifdef EMIT_ASN_DEBUG
if(st) {
fprintf(stderr, "=== currently ===\n");
asn_fprint(stderr, &asn_DEF_PDU, st);
fprintf(stderr, "=== end ===\n");
}
+#endif
rval = zer_decode(0, &asn_DEF_PDU, (void **)&st,
fbuf + fbuf_offset,
fbuf_chunk < fbuf_left
diff --git a/skeletons/tests/Makefile.am b/skeletons/tests/Makefile.am
index ac05364e..546bb67d 100644
--- a/skeletons/tests/Makefile.am
+++ b/skeletons/tests/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/skeletons
-
check_PROGRAMS = \
check-ber_tlv_tag \
check-length \
@@ -14,6 +12,7 @@ check_PROGRAMS = \
check-PER \
check-PER-INTEGER
+AM_CPPFLAGS = -I$(top_srcdir)/skeletons $(TESTSUITE_CFLAGS)
AM_LDFLAGS = $(top_builddir)/skeletons/libasn1cskeletons.la
LDADD = -lm
diff --git a/skeletons/tests/Makefile.in b/skeletons/tests/Makefile.in
index 0b4b12f5..7afee1b3 100644
--- a/skeletons/tests/Makefile.in
+++ b/skeletons/tests/Makefile.in
@@ -248,7 +248,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_srcdir)/skeletons
+AM_CPPFLAGS = -I$(top_srcdir)/skeletons $(TESTSUITE_CFLAGS)
AM_LDFLAGS = $(top_builddir)/skeletons/libasn1cskeletons.la
LDADD = -lm
TESTS = $(check_PROGRAMS)
diff --git a/skeletons/tests/check-OCTET_STRING.c b/skeletons/tests/check-OCTET_STRING.c
index e03ecf51..3aad01a2 100644
--- a/skeletons/tests/check-OCTET_STRING.c
+++ b/skeletons/tests/check-OCTET_STRING.c
@@ -3,7 +3,6 @@
#include <time.h>
#include <sys/time.h>
-#define EMIT_ASN_DEBUG 1
#include <OCTET_STRING.h>
#include <BIT_STRING.h>
diff --git a/skeletons/tests/check-PER-INTEGER.c b/skeletons/tests/check-PER-INTEGER.c
index 0d971b3a..94f8280a 100644
--- a/skeletons/tests/check-PER-INTEGER.c
+++ b/skeletons/tests/check-PER-INTEGER.c
@@ -1,7 +1,6 @@
#include <stdio.h>
#include <assert.h>
-#define EMIT_ASN_DEBUG 1
#include <INTEGER.h>
#include <INTEGER.c>
#include <per_support.c>
diff --git a/skeletons/tests/check-PER.c b/skeletons/tests/check-PER.c
index 9d06a2ea..8b55f23d 100644
--- a/skeletons/tests/check-PER.c
+++ b/skeletons/tests/check-PER.c
@@ -1,7 +1,6 @@
#include <stdio.h>
#include <assert.h>
-#define EMIT_ASN_DEBUG 1
#include <per_support.c>
#include <per_support.h>
@@ -290,14 +289,14 @@ check_per_encoding_auto() {
ret = per_put_few_bits(&po, -1, prior);
assert(ret == 0);
- fprintf(stderr, " (out{nboff=%d,nbits=%d,buf_offset=%d})\n", (int)po.nboff, (int)po.nbits, (int)(po.buffer - po.tmpspace));
+ ASN_DEBUG(" (out{nboff=%d,nbits=%d,buf_offset=%d})", (int)po.nboff, (int)po.nbits, (int)(po.buffer - po.tmpspace));
ret = per_put_few_bits(&po, -1, next);
assert(ret == 0);
- fprintf(stderr, " (out{nboff=%d,nbits=%d,buf_offset=%d})\n", (int)po.nboff, (int)po.nbits, (int)(po.buffer - po.tmpspace));
+ ASN_DEBUG(" (out{nboff=%d,nbits=%d,buf_offset=%d})", (int)po.nboff, (int)po.nbits, (int)(po.buffer - po.tmpspace));
- fprintf(stderr, "Putting %d + %d bits (%d/%d), got %d bytes and %d bits\n",
+ ASN_DEBUG("Putting %d + %d bits (%d/%d), got %d bytes and %d bits",
prior, next, (prior + next) / 8, (prior + next) % 8,
(int)(po.buffer - po.tmpspace), (int)po.nboff);
assert((po.buffer - po.tmpspace) * 8 + po.nboff == prior + next);
diff --git a/skeletons/tests/check-REAL.c b/skeletons/tests/check-REAL.c
index adad56e7..ba35244d 100644
--- a/skeletons/tests/check-REAL.c
+++ b/skeletons/tests/check-REAL.c
@@ -2,7 +2,6 @@
#include <assert.h>
#include <math.h>
-#define EMIT_ASN_DEBUG 1
#include <REAL.h>
static char reconstructed[2][512];
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 09:19:48 +0000