[git] gnupg-doc - branch, master, updated. d6a2c2992be786c94ce0e1aae5a71d80bc860e92

[by Justus Winter]

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 "The GnuPG website and other docs".

The branch, master has been updated
       via  d6a2c2992be786c94ce0e1aae5a71d80bc860e92 (commit)
       via  7b350bf5bf12203443d0e4efd7e7a6ce165869cc (commit)
      from  7a6a12e6aa916f4b09910d34df7ca16049edee86 (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 d6a2c2992be786c94ce0e1aae5a71d80bc860e92
Author: Justus Winter <justus at g10code.com>
Date:   Tue Feb 14 12:14:13 2017 +0100

    jenkins: hack around the RUNPATH issue

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index 68e1ee7..9cb5f0d 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -114,11 +114,24 @@ case "$JOB_NAME" in
         ;;
 esac
 
-# The libraries use rpath when linking the tests, so they locate their
-# dependencies that way.  GnuPG, however, does not.  Therefore, we set
-# LD_LIBRARY_PATH.
+# The libraries use RUNPATH when linking the tests, so they locate
+# their dependencies that way.  GnuPG, however, does not.  Therefore,
+# we set LD_LIBRARY_PATH.
 test_environment="LD_LIBRARY_PATH=$ORIGINAL_PREFIX/lib"
 
+# HACKHACKHACK:
+#
+# Because newer Debian toolchains prefer RUNPATH over RPATH, and
+# RUNPATH has lower precedence than LD_LIBRARY_PATH, we need to
+# explicitly add libtool's .libs directory:
+test_environment="LD_LIBRARY_PATH=$(pwd)/obj/src/.libs:$ORIGINAL_PREFIX/lib"
+#
+# If we don't do this, the version tests fail because the runtime
+# linker will pick up the library from LD_LIBRARY_PATH.  Also, testing
+# the installed version is not what we want ofc.
+#
+# KCAHKCAHKCAH
+
 # See if we have a GPGME checkout for the tesets.
 xtest_gpgme_srcdir="$HOME/src/gpgme-for-gnupgs-tests"
 if [ -d "$xtest_gpgme_srcdir/obj" ]; then
@@ -232,6 +245,20 @@ case "$XTARGET" in
 	  cd "$WORKDIR"
           $abs_configure --prefix=$PREFIX --enable-maintainer-mode \
                    $CONFIGUREFLAGS
+
+	  # Extract the directory / tarname from the package
+          tarname=$(awk <config.h '
+	             /^#define PACKAGE_TARNAME/ {gsub(/"/,"",$3);name=$3};
+	             /^#define PACKAGE_VERSION/ {gsub(/"/,"",$3);vers=$3};
+		     END {print name "-" vers}')
+
+	  # HACKHACKHACK: Because newer Debian toolchains prefer
+	  # RUNPATH over RPATH, and RUNPATH has lower precedence than
+	  # LD_LIBRARY_PATH, we need to explicitly add libtool's .libs
+	  # directory:
+	  test_environment="LD_LIBRARY_PATH=$(pwd)/${tarname}/_build/sub/src/.libs:$ORIGINAL_PREFIX/lib"
+	  # KCAHKCAHKCAH
+
 	  if ! env $test_environment $MAKE $MAKEFLAGS distcheck ; then
               # Jenkins looks for "FAIL:" to mark a build unstable,
               # hence we ignore errors here.
@@ -239,11 +266,6 @@ case "$XTARGET" in
 	      exit 0
 	  fi
 
-          # Extract the tarname from the package
-          tarname=$(awk <config.h '
-	             /^#define PACKAGE_TARNAME/ {gsub(/"/,"",$3);name=$3};
-	             /^#define PACKAGE_VERSION/ {gsub(/"/,"",$3);vers=$3};
-		     END {print name "-" vers}')
 	  if [ -f "${tarname}.tar.bz2" ]; then
 	     bzcat "${tarname}.tar.bz2" | tar xf -
 	  elif [ -f "${tarname}.tar.gz" ]; then
@@ -254,7 +276,7 @@ case "$XTARGET" in
 	  fi
           # And do a final build using the generated tarball
 	  cd ${tarname}
-	  ./configure --prefix=$PREFIX $CONFIGUREFLAGS LD_LIBRARY_PATH=$PREFIX/lib
+	  ./configure --prefix=$PREFIX $CONFIGUREFLAGS
 	  $MAKE $MAKEFLAGS
 	  $MAKE $MAKEFLAGS install
 

commit 7b350bf5bf12203443d0e4efd7e7a6ce165869cc
Author: Justus Winter <justus at g10code.com>
Date:   Mon Feb 13 13:09:14 2017 +0100

    jenkins: tweak scute configuration

diff --git a/misc/jenkins/jobs/scute/config.xml b/misc/jenkins/jobs/scute/config.xml
index f63ca2a..4cb4d3b 100644
--- a/misc/jenkins/jobs/scute/config.xml
+++ b/misc/jenkins/jobs/scute/config.xml
@@ -91,7 +91,7 @@
       </consoleParsers>
     </hudson.plugins.warnings.WarningsPublisher>
     <hudson.plugins.textfinder.TextFinderPublisher plugin="text-finder at 1.10">
-      <regexp>FAIL: </regexp>
+      <regexp>FAIL:\s*[0-9]*[1-9][0-9]*</regexp>
       <succeedIfFound>false</succeedIfFound>
       <unstableIfFound>true</unstableIfFound>
       <alsoCheckConsoleOutput>true</alsoCheckConsoleOutput>

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

Summary of changes:
 misc/jenkins/bin/build.bash        | 40 +++++++++++++++++++++++++++++---------
 misc/jenkins/jobs/scute/config.xml |  2 +-
 2 files changed, 32 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org