From c568d29968902bb7a463163d825e268a7457a909 Mon Sep 17 00:00:00 2001
From: Mouse <mouse008@gmail.com>
Date: Mon, 30 Jan 2017 20:09:35 -0500
Subject: [PATCH] Merged #105 (more or less)

---
 Makefile.am                   |  6 ++++++
 README.md                     |  3 +++
 asn1c/Makefile.am             |  1 +
 asn1c/tests/Makefile.am       |  1 +
 asn1c/tests/check-assembly.sh |  6 +++---
 configure.ac                  | 23 ++++++++++++++++++++++-
 libasn1fix/Makefile.am        |  1 +
 skeletons/GeneralizedTime.c   |  2 ++
 skeletons/REAL.c              |  2 ++
 skeletons/tests/Makefile.am   |  2 ++
 10 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 870ee8f6a..407d70dfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,12 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+@CODE_COVERAGE_RULES@
+CODE_COVERAGE_IGNORE_PATTERN="tests/*" "lex.yy.c" "y.tab.c" "asn1p_l.l" "asn1p_y.y"
+
+@CODE_COVERAGE_RULES@
+CODE_COVERAGE_IGNORE_PATTERN="tests/*" "lex.yy.c" "y.tab.c" "asn1p_l.l" "asn1p_y.y"
+
 SUBDIRS = 				\
 	libasn1parser libasn1fix	\
 	libasn1print libasn1compiler	\
diff --git a/README.md b/README.md
index 22fd06e39..4eb9185c7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+
+[![Coverage Status](https://coveralls.io/repos/github/velichkov/asn1c/badge.svg?branch=master)](https://coveralls.io/github/velichkov/asn1c?branch=master)
+
 # About
 
 ASN.1 to C compiler takes the ASN.1 module files (example) and generates
diff --git a/asn1c/Makefile.am b/asn1c/Makefile.am
index d15272237..81af76afb 100644
--- a/asn1c/Makefile.am
+++ b/asn1c/Makefile.am
@@ -1,3 +1,4 @@
+@CODE_COVERAGE_RULES@
 
 SUBDIRS = . tests
 
diff --git a/asn1c/tests/Makefile.am b/asn1c/tests/Makefile.am
index 352122a6c..3bb0f9d78 100644
--- a/asn1c/tests/Makefile.am
+++ b/asn1c/tests/Makefile.am
@@ -1,3 +1,4 @@
+@CODE_COVERAGE_RULES@
 
 SUBDIRS = check-src
 
diff --git a/asn1c/tests/check-assembly.sh b/asn1c/tests/check-assembly.sh
index 22e2b6dd3..baa433fc1 100755
--- a/asn1c/tests/check-assembly.sh
+++ b/asn1c/tests/check-assembly.sh
@@ -54,7 +54,7 @@ cat > "$testdir/Makefile" <<EOM
 # This file is autogenerated by ../$0
 
 COMMON_FLAGS= -I.
-CFLAGS = \${COMMON_FLAGS} ${CFLAGS:-} -g -O0
+CFLAGS = \${COMMON_FLAGS} ${CFLAGS:-} -g -O0 -I ${abs_top_srcdir}/skeletons
 CPPFLAGS = -DSRCDIR=../${srcdir}
 CXXFLAGS = \${COMMON_FLAGS} ${CXXFLAGS}
 
@@ -63,12 +63,12 @@ CC ?= ${CC}
 all: check-executable
 check-executable: compiled-module *.c*
 	@rm -f *.core
-	\$(CC) \$(CPPFLAGS) \$(CFLAGS) -o check-executable *.c* -lm
+	\$(CC) \$(CPPFLAGS) \$(CFLAGS) -o check-executable *.c* -L${abs_top_builddir}/skeletons/.libs -lasn1cskeletons -lm
 
 # Compile the corresponding .asn1 spec.
 compiled-module: ${asn_module} ${abs_top_builddir}/asn1c/asn1c
 	${abs_top_builddir}/asn1c/asn1c		\\
-		-S ${abs_top_srcdir}/skeletons	\\
+		-S /tmp/do/not/copy/skeletons	\\
 		-Wdebug-compiler		\\
 		${AFLAGS} ${asn_module}
 	rm -f converter-sample.c
diff --git a/configure.ac b/configure.ac
index 58ce1ee77..add2f3625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,20 @@ AC_ARG_ENABLE(test-Werror,
       TESTSUITE_CFLAGS="-Werror -W -Wpointer-arith"
   ])
 
+AX_CODE_COVERAGE
+AS_IF([test x$enable_code_coverage != xno], [
+	CFLAGS="$CFLAGS $CODE_COVERAGE_CFLAGS"
+	# The CODE_COVERAGE_CPPFLAGS contains -DNDEBUG flag
+	# which removes assert(...) macros from code coverage and improves the
+	# branches score. But when it is defined it results in few
+	# unsed-but-set-variable warnings that are treated as errors in the travis-ci
+	# build because these variables are only used inside assert macros.
+	# error: variable ‘ret’ set but not used [-Werror=unused-but-set-variable]
+	#CPPFLAGS="$CPPFLAGS $CODE_COVERAGE_CPPFLAGS"
+	CXXFLAGS="$CXXFLAGS $CODE_COVERAGE_CXXFLAGS"
+	LDFLAGS="$LDFLAGS $CODE_COVERAGE_LDFLAGS"
+])
+
 AC_SUBST(ADD_CFLAGS)
 AC_SUBST(TESTSUITE_CFLAGS)
 
@@ -87,7 +101,14 @@ SKELETONS_CFLAGS="${ADD_CFLAGS} ${SKELETONS_CFLAGS}"
 AX_CHECK_COMPILE_FLAG([-std=c99],
     [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -std=c99"])
 AX_CHECK_COMPILE_FLAG([-Wpedantic],
-    [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -Wpedantic"])
+    [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -Wpedantic"],
+    [
+        dnl When -Wpedantic is not supported try the -pedantic instead. (gcc-4.7)
+        dnl See https://gcc.gnu.org/gcc-4.8/changes.html
+        AX_CHECK_COMPILE_FLAG([-pedantic],
+            [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -pedantic"], [], [-Werror])
+    ],
+    [-Werror]) #clang 3.0 prints warning when the flag is not supported
 AX_CHECK_COMPILE_FLAG([-Wno-duplicate-decl-specifier],
     [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -Wno-duplicate-decl-specifier"])
 AC_SUBST(SKELETONS_CFLAGS)
diff --git a/libasn1fix/Makefile.am b/libasn1fix/Makefile.am
index 71df46a97..5e506ccd2 100644
--- a/libasn1fix/Makefile.am
+++ b/libasn1fix/Makefile.am
@@ -1,3 +1,4 @@
+@CODE_COVERAGE_RULES@
 
 AM_CFLAGS = @ADD_CFLAGS@
 AM_CPPFLAGS =				\
diff --git a/skeletons/GeneralizedTime.c b/skeletons/GeneralizedTime.c
index be164b41f..39bdbaa2c 100644
--- a/skeletons/GeneralizedTime.c
+++ b/skeletons/GeneralizedTime.c
@@ -4,7 +4,9 @@
  */
 #define	_POSIX_PTHREAD_SEMANTICS	/* for Sun */
 #define	_REENTRANT			/* for Sun */
+#ifndef _BSD_SOURCE
 #define _BSD_SOURCE     /* for timegm(3) */
+#endif
 #include <asn_internal.h>
 #include <GeneralizedTime.h>
 
diff --git a/skeletons/REAL.c b/skeletons/REAL.c
index 1b02c8425..8a3a20a07 100644
--- a/skeletons/REAL.c
+++ b/skeletons/REAL.c
@@ -3,7 +3,9 @@
  * Redistribution and modifications are permitted subject to BSD license.
  */
 #define	_ISOC99_SOURCE		/* For ilogb() and quiet NAN */
+#ifndef _BSD_SOURCE
 #define	_BSD_SOURCE		/* To reintroduce finite(3) */
+#endif
 #if	defined(__alpha)
 #include <sys/resource.h>	/* For INFINITY */
 #endif
diff --git a/skeletons/tests/Makefile.am b/skeletons/tests/Makefile.am
index 546bb67df..26db11b1b 100644
--- a/skeletons/tests/Makefile.am
+++ b/skeletons/tests/Makefile.am
@@ -1,3 +1,5 @@
+@CODE_COVERAGE_RULES@
+
 check_PROGRAMS = \
 	check-ber_tlv_tag	\
 	check-length		\