[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-478-gc19d566

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  c19d5664cc0d32b548896f5611f516289c8edc38 (commit)
      from  ba57792a2a046fcf18d5fa296c67d9949afba7c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=c19d5664cc0d32b548896f5611f516289c8edc38


commit c19d5664cc0d32b548896f5611f516289c8edc38
Author: Daniele Forsi <address@hidden>
Date:   Fri Apr 19 12:10:49 2013 +0200

    Make the tests suitable for make distcheck and enable them
    
    The source directory isn't writable during make distcheck.

diff --git a/Makefile.am b/Makefile.am
index 49ea2ef..9b3032e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@ if SMSD
 SUBDIRS += smsd
 endif
 
+SUBDIRS += testsuite
+
 DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii po smsd 
Windows testsuite getopt
 
 EXTRA_DIST =                           \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 7c74ac4..7fac5f0 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -63,6 +63,9 @@ EXTRA_DIST =                  \
 check: $(EXTRA_DIST)
        $(srcdir)/testit $(srcdir)/ "$(top_builddir)/gnokii/gnokii --config 
.gnokiirc"
 
+clean-local:
+       -rm -f myout.*
+
 noinst_PROGRAMS = dump-vcard
 dump_vcard_LDADD = $(top_builddir)/common/libgnokii.la
 dump_vcard_SOURCES = dump-vcard.c
diff --git a/testsuite/testit b/testsuite/testit
index 22e39d4..bb329cf 100755
--- a/testsuite/testit
+++ b/testsuite/testit
@@ -16,7 +16,6 @@ LC_MES_TMP=$LC_MESSAGES
 export LC_MESSAGES=C
 
 RETVAL=0
-cd $TESTDIR
 # For now ignore the tests that are known to fail:
 #   - test.2.concatsms
 #   - test.17.picture2
@@ -33,12 +32,12 @@ for A in test.00.identify \
        test.01.writephonebook; do
     echo -n "Doing $A... "
     B=`echo $A | sed s/test/out/`
-    source $A 2>&1 | grep -v ^GNOKII | grep -v '^Doing operation' > my$B
-    if cmp my$B $B > /dev/null 2>&1; then
+    ( cd $TESTDIR; source $A 2>&1 ) | grep -v ^GNOKII > my$B
+    if cmp $TESTDIR$B my$B >/dev/null 2>&1; then
        echo ok
     else
        echo '*** FAILED'
-       diff -u $B my$B
+       diff -u $TESTDIR$B my$B
        RETVAL=1
     fi
 done

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am           |    2 ++
 testsuite/Makefile.am |    3 +++
 testsuite/testit      |    7 +++----
 3 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs