source: mod_gnutls/debian/patches/0006-Test-suite-Do-not-explicitly-set-the-mutex-type-to-d.patch @ 36663ec

debian/masterdebian/stretch-backports
Last change on this file since 36663ec was 36663ec, checked in by Thomas Klute <thomas2.klute@…>, 5 years ago

Add test suite and compatibility patches from master

Added 0002-Test-suite-Run-flock-with-verbose-to-log-timeouts.patch: test suite fix
Added 0005-Check-if-flock-supports-verbose.patch: test suite fix
Added 0004-Test-suite-Make-timeouts-for-server-locks-and-HTTPS-.patch: test suite fix
Added 0006-Test-suite-Do-not-explicitly-set-the-mutex-type-to-d.patch: test suite fix
Added 0007-Do-not-treat-warnings-about-deprecated-declarations-.patch: GnuTLS 3.5.9 compatibility
Added 0003-Test-suite-Log-if-a-process-to-be-stopped-by-PID-fil.patch: test suite logging

  • Property mode set to 100644
File size: 1.9 KB
  • configure.ac

    From: Thomas Klute <thomas2.klute@uni-dortmund.de>
    Date: Sun, 12 Feb 2017 13:24:54 +0100
    Subject: Test suite: Do not explicitly set the mutex type to "default"
    
    The setting can cause trouble when the mutex type "default" is file
    based and its definition includes a path that the build process cannot
    write to. This problem caused the Debian build to fail on hurd-i386,
    where "default" resolved to "file:/var/run/apache2/" according to the
    build log.
    
    According to the HTTPD documentation a run-time file directory
    relative to ServerRoot is used absent an explicit setting, and the
    ServerRoot defined in test/base_apache.conf must be writable for the
    test suite anyway.
    ---
     configure.ac                   | 8 ++++----
     test/apache-conf/netns.conf.in | 2 +-
     2 files changed, 5 insertions(+), 5 deletions(-)
    
    diff --git a/configure.ac b/configure.ac
    index 425f2b8..cc3e8ae 100644
    a b AM_CONDITIONAL([ENABLE_NETNS], [test "$use_netns" != "no"]) 
    152152# Adjust Apache configuration for tests accordingly: Use pthread mutex
    153153# and test specific PID files if using namespaces, defaults otherwise.
    154154AS_IF([test "$use_netns" = "yes"],
    155       [MUTEX_TYPE="pthread"; PID_AFFIX="-\${TEST_NAME}"],
    156       [MUTEX_TYPE="default"; PID_AFFIX=""])
    157 AC_SUBST(MUTEX_TYPE)
     155      [MUTEX_CONF="Mutex pthread default"; PID_AFFIX="-\${TEST_NAME}"],
     156      [MUTEX_CONF=""; PID_AFFIX=""])
     157AC_SUBST(MUTEX_CONF)
    158158AC_SUBST(PID_AFFIX)
    159 AM_SUBST_NOTMAKE(MUTEX_TYPE)
     159AM_SUBST_NOTMAKE(MUTEX_CONF)
    160160AM_SUBST_NOTMAKE(PID_AFFIX)
    161161
    162162AC_ARG_ENABLE(msva,
  • test/apache-conf/netns.conf.in

    diff --git a/test/apache-conf/netns.conf.in b/test/apache-conf/netns.conf.in
    index 2439337..005d48f 100644
    a b  
    11# This file contains options that are different depending on whether
    22# tests use namespaces or not.
    3 Mutex   @MUTEX_TYPE@    default
     3@MUTEX_CONF@
    44PidFile apache2@PID_AFFIX@.pid
Note: See TracBrowser for help on using the repository browser.