Add coverage support with --enable-profile, cleaned up debug so it's

just --enable-debug, etc.

svn path=/trunk/; revision=363

diff --git a/Makefile.am b/Makefile.am
index 81ba176..ff17920 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = po \
        extensions\
        doc\
        examples\
-        modules \
+       modules \
        tests
        
 
@@ -24,7 +24,6 @@ seeddoc_DATA = \
 pkgconfig_DATA = seed.pc 
 
 pkgconfigdir = $(libdir)/pkgconfig
-       
 
 EXTRA_DIST = $(seeddoc_DATA) \
        $(pkgconfig_DATA)
@@ -41,3 +40,10 @@ dist-hook:
 test:
        cd tests ; ./run-tests.py
 
+profile-reset:
+       find -name '*.gcda' -delete
+
+profile: profile-reset test
+       cp libseed/*.c libseed/.libs/
+       cd libseed/.libs ; gcov *.c
+

diff --git a/configure.ac b/configure.ac
index 65bf69b..2f689a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,3 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta application wizard.
-
 AC_INIT(seed, 0.1.2)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -12,11 +9,7 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-AM_GCONF_SOURCE_2
-
-dnl ***************************************************************************
-dnl Internationalization
-dnl ***************************************************************************
+dnl =====================Internationalization==================================
 GETTEXT_PACKAGE=seed
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
@@ -25,7 +18,7 @@ IT_PROG_INTLTOOL([0.35.0])
 
 AM_PROG_LIBTOOL
 
-dnl libffi
+dnl ============================libffi=========================================
 PKG_CHECK_MODULES(libffi, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
 
 if test x"$have_ffi_pkgconfig" = xno ; then
@@ -61,36 +54,51 @@ if test x"$have_ffi_pkgconfig" = xno ; then
   AC_SUBST(FFI_CFLAGS)
 fi
 
-dnl readline
+dnl ==========================libreadline======================================
 AC_CHECK_LIB(readline, readline,
     AC_DEFINE(HAVE_LIBREADLINE, 1, [have readline]),
     AC_MSG_ERROR([readline not found]))
 
-m4_define([debug_default], "yes")
-
+dnl =============================Debug=========================================
+AC_MSG_CHECKING([whether to do a debug build])
 AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug=@<:@no/yes@:>@],
-                             [build debugging code. This does not actually enable debugging, it only builds the code in. Pass --seed-debug=(misc/finalization/initialization/signal/all) to enable debugging. @<:@default=debug_default@:>@]),
-,
-              enable_debug=debug_default)
+              AC_HELP_STRING([--enable-debug],
+                             [build debugging code. This does not actually enable debugging, it only builds the code in. Pass --seed-debug=(misc/finalization/initialization/signal/all) to enable debugging. [default=no]]),
+              [enable_debug="yes"],[enable_debug="no"])
+AC_MSG_RESULT([$enable_debug])
 
 if test "x$enable_debug" = "xyes"; then
-  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  SEED_DEBUG_CFLAGS="-DSEED_ENABLE_DEBUG"
+  SEED_DEBUG_CFLAGS="-DSEED_ENABLE_DEBUG -g -O0"
 else
-  if test "x$enable_debug" = "xno"; then
-    SEED_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
-  fi
+  SEED_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -g -O0"
 fi
 
 AC_SUBST(SEED_DEBUG_CFLAGS)
 
+dnl ===========================Profiling=======================================
+AC_MSG_CHECKING([whether to enable profiling])
+AC_ARG_ENABLE(profile,
+              AC_HELP_STRING([--enable-profile],
+                             [turn on profiling [default=no]]),
+              [enable_profile="yes"],[enable_profile="no"])
+AC_MSG_RESULT([$enable_profile])
+
+if test "x$enable_profile" = "xyes"; then
+  SEED_PROFILE_CFLAGS="-fprofile-arcs -ftest-coverage"
+  SEED_PROFILE_LDFLAGS="-lgcov"
+fi
+
+AC_SUBST(SEED_PROFILE_CFLAGS)
+AC_SUBST(SEED_PROFILE_LDFLAGS)
+
+dnl ===========================Packages========================================
 PKG_CHECK_MODULES(SEED, gobject-introspection-1.0 webkit-1.0)
 PKG_CHECK_MODULES(LIBSEED, gobject-introspection-1.0 webkit-1.0)
 
 AC_CONFIG_FILES([
 seed.pc])
 
+dnl =============================Output========================================
 AC_OUTPUT([
 Makefile
 libseed/Makefile

diff --git a/libseed/Makefile.am b/libseed/Makefile.am
index f46bb07..d7817ea 100644 (file)
--- a/libseed/Makefile.am
+++ b/libseed/Makefile.am
@@ -1,4 +1,3 @@
-
 lib_LTLIBRARIES = \
        libseed.la
 
@@ -39,7 +38,8 @@ seedheadersdir = \
 EXTRA_DIST = \
        $(seedheaders_HEADERS)
 
-LIBSEED_CFLAGS+=-Werror $(SEED_DEBUG_CFLAGS)
+LIBSEED_CFLAGS+=-Werror $(SEED_DEBUG_CFLAGS) $(SEED_PROFILE_CFLAGS)
+AM_LDFLAGS=$(SEED_PROFILE_LDFLAGS)
 
 ## File created by the gnome-build tools
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 4defaa7..cea807d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,8 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS =\
         -Wall\
-        -g
+        $(SEED_DEBUG_CFLAGS)\
+        $(SEED_PROFILE_CFLAGS)
 
 bin_PROGRAMS = seed
 
@@ -18,7 +19,7 @@ seed_SOURCES = \
        main.c
 
 seed_LDFLAGS = \
-       -L../libseed/.libs -lseed -lreadline
+       -L../libseed/.libs -lseed -lreadline $(SEED_PROFILE_LDFLAGS)
 
 seed_LDADD = \
        $(SEED_LIBS) \

diff --git a/tests/struct-functions.js b/tests/struct-functions.js
new file mode 100755 (executable)
index 0000000..677ba3c
--- /dev/null
+++ b/tests/struct-functions.js
@@ -0,0 +1,10 @@
+#!/usr/bin/env seed
+// Returns: 0
+// STDIN:
+// STDOUT:
+// STDERR:
+Seed.import_namespace("GConf");
+
+GConf.init(null, null);
+
+client = GConf.Client.get_default();