[myserver-commit] [SCM] GNU MyServer branch, master, updated. 4a01ae79028f9363e111210e2d267b5e4fa86ce6

[Giuseppe Scrivano]

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 "GNU MyServer".

The branch, master has been updated
       via  4a01ae79028f9363e111210e2d267b5e4fa86ce6 (commit)
       via  d91d2fcbb16433de15a2a91dee7d140d6c7d7e6f (commit)
      from  d045b54be1eabae67ba544470c2bd7ae583e6233 (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 -----------------------------------------------------------------


commit 4a01ae79028f9363e111210e2d267b5e4fa86ce6
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Aug 19 18:30:08 2009 +0200

    Fix the `make check' command.  Now it executes the `tests_suite' program 
when it is available.

diff --git a/myserver/Makefile.am b/myserver/Makefile.am
index ba6a32c..11fcb07 100644
--- a/myserver/Makefile.am
+++ b/myserver/Makefile.am
@@ -1,8 +1,6 @@
-# Makefile : Builds myserver, math_sum, and post
-#
-
 if BUILD_TESTS
-TESTS = tests
+TESTS_DIR = tests
+TESTS = tests/tests_suite$(EXEEXT)
 endif
 
 if BUILD_DOC
@@ -14,7 +12,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-pthread-check.m4 
\
         $(top_srcdir)/m4/libxml.m4 $(top_srcdir)/m4/cppunit.m4 \
         $(top_srcdir)/configure.in
 
-
-SUBDIRS = src include $(CONTROL) $(CGI_LIB) binaries $(DOCS) $(TESTS)
+SUBDIRS = src include $(CONTROL) $(CGI_LIB) binaries $(DOCS) $(TESTS_DIR)
 
 EXTRA_DIST = stdafx.h stdafx.cpp doxygen SConstruct



commit d91d2fcbb16433de15a2a91dee7d140d6c7d7e6f
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Aug 19 18:23:43 2009 +0200

    Fix a race.

diff --git a/myserver/tests/test_filter_chain.cpp 
b/myserver/tests/test_filter_chain.cpp
index 6551c6d..c69afb0 100644
--- a/myserver/tests/test_filter_chain.cpp
+++ b/myserver/tests/test_filter_chain.cpp
@@ -1,6 +1,6 @@
 /*
  MyServer
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009 Free Software Foundation, Inc.
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 3 of the License, or
@@ -74,12 +74,12 @@ public:
 
     char *pBuff = szExpected;
     int i = nLength;
-    while ( !fc->read(szTemp, 64, &nbw) && i > 0 )
-    {
-      strncpy(pBuff, szTemp, (int)nbw > i ? i : nbw);
-      pBuff += nbw;
-      i -= nbw;
-    }
+    while ( !fc->read(szTemp, 64, &nbw) && nbw > 0 && i > 0 )
+      {
+        strncpy (pBuff, szTemp, (int)nbw > i ? i : nbw);
+        pBuff += nbw;
+        i -= nbw;
+      }
     szExpected[nLength] = '\0';
     fc->clearAllFilters();
 

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

Summary of changes:
 myserver/Makefile.am                 |    9 +++------
 myserver/tests/test_filter_chain.cpp |   14 +++++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU MyServer