[Pkg-shadow-commits] r3636 - in debian/trunk/debian: . patches
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sat Nov 19 15:01:24 UTC 2011
Author: nekral-guest
Date: 2011-11-19 15:01:22 +0000 (Sat, 19 Nov 2011)
New Revision: 3636
Modified:
debian/trunk/debian/changelog
debian/trunk/debian/patches/901_testsuite_gcov
Log:
* debian/patches/901_testsuite_gcov: Do not revert the locale when testing
with gcov to avoid coverage false negatives. This does not impact the
debian binary package, only the test package.
Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog 2011-11-19 14:34:59 UTC (rev 3635)
+++ debian/trunk/debian/changelog 2011-11-19 15:01:22 UTC (rev 3636)
@@ -82,6 +82,9 @@
* debian/patches/506_relaxed_usernames: Really check if the user/group
name starts with a dash. Also forbid names starting with '+' or '~'.
Document the naming policy in useradd.8 / groupadd.8.
+ * debian/patches/901_testsuite_gcov: Do not revert the locale when testing
+ with gcov to avoid coverage false negatives. This does not impact the
+ debian binary package, only the test package.
[ Christian Perrier ]
* Use "linux-any" instead of a negated list of architectures in
Modified: debian/trunk/debian/patches/901_testsuite_gcov
===================================================================
--- debian/trunk/debian/patches/901_testsuite_gcov 2011-11-19 14:34:59 UTC (rev 3635)
+++ debian/trunk/debian/patches/901_testsuite_gcov 2011-11-19 15:01:22 UTC (rev 3636)
@@ -22,9 +22,9 @@
noinst_LIBRARIES = libmisc.a
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -6,6 +6,8 @@
- usbindir = ${prefix}/sbin
+@@ -7,6 +7,8 @@
suidperms = 4755
+ sgidperms = 2755
+CFLAGS += -fprofile-arcs -ftest-coverage
+
@@ -33,7 +33,7 @@
-I$(top_srcdir)/libmisc
--- a/debian/rules
+++ b/debian/rules
-@@ -39,6 +39,12 @@
+@@ -40,6 +40,12 @@
endif
export CFLAGS
@@ -46,3 +46,31 @@
# Add extras to the install process:
binary-install/login::
dh_installpam -p login
+--- a/lib/defines.h
++++ b/lib/defines.h
+@@ -174,23 +174,9 @@
+ trust the formatted time received from the unix domain (or worse,
+ UDP) socket. -MM */
+ /* Avoid translated PAM error messages: Set LC_ALL to "C".
++ * This is disabled for coverage testing
+ * --Nekral */
+-#define SYSLOG(x) \
+- do { \
+- char *old_locale = setlocale (LC_ALL, NULL); \
+- char *saved_locale = NULL; \
+- if (NULL != old_locale) { \
+- saved_locale = strdup (old_locale); \
+- } \
+- if (NULL != saved_locale) { \
+- (void) setlocale (LC_ALL, "C"); \
+- } \
+- syslog x ; \
+- if (NULL != saved_locale) { \
+- (void) setlocale (LC_ALL, saved_locale); \
+- free (saved_locale); \
+- } \
+- } while (false)
++#define SYSLOG(x) syslog x
+ #else /* !ENABLE_NLS */
+ #define SYSLOG(x) syslog x
+ #endif /* !ENABLE_NLS */
More information about the Pkg-shadow-commits
mailing list