[git] gnupg-doc - branch, master, updated. 91aac71723e2d6dc345da9a56c44f1645d567065

by Justus Winter cvs at cvs.gnupg.org
Fri Jul 14 14:16:53 CEST 2017


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  91aac71723e2d6dc345da9a56c44f1645d567065 (commit)
       via  1c0c36f9fa441fc9df6ca172c8f57855322e9f0e (commit)
      from  4706bdd306010ed5a14e927f21446e661c166da2 (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 91aac71723e2d6dc345da9a56c44f1645d567065
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 14 14:16:43 2017 +0200

    jenkins: use target check-all if available

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index a997b5d..2737c08 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -219,6 +219,15 @@ done
 set -x
 
 
+# Select the appropriate test target.
+function check_target() {
+    if grep >/dev/null check-all Makefile; then
+	echo check-all
+    else
+	echo check
+    fi
+}
+
 # Switch on the different targets.
 case "$XTARGET" in
     native)
@@ -229,7 +238,7 @@ case "$XTARGET" in
 	           CXXFLAGS="$CXXFLAGS -std=c++11"
         $MAKE $MAKEFLAGS
 
-        env $test_environment $MAKE -k check verbose=2 \
+        env $test_environment $MAKE -k $(check_target) verbose=2 \
 	    || echo "FAIL: make check failed with status $?"
         # Jenkins looks for "FAIL:" to mark a build unstable,
         # hence || ... here
@@ -249,7 +258,7 @@ case "$XTARGET" in
 	test_environment="$(echo $test_environment | sed -e 's#obj/##g')"
 	# KCAHKCAHKCAH
 
-        env $test_environment $MAKE -k check verbose=2 \
+        env $test_environment $MAKE -k $(check_target) verbose=2 \
 	    || echo "FAIL: make check failed with status $?"
         # Jenkins looks for "FAIL:" to mark a build unstable,
         # hence || ... here
@@ -267,7 +276,7 @@ case "$XTARGET" in
 	           CXXFLAGS="$CXXFLAGS $SANFLAGS -fPIC -std=c++11"
         $SCANBUILD $MAKE $MAKEFLAGS
 
-        env $test_environment $MAKE -k check verbose=2 \
+        env $test_environment $MAKE -k $(check_target) verbose=2 \
 	    || echo "FAIL: make check failed with status $?"
         # Jenkins looks for "FAIL:" to mark a build unstable,
         # hence || ... here

commit 1c0c36f9fa441fc9df6ca172c8f57855322e9f0e
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 14 14:14:56 2017 +0200

    jenkins: more generic she bang

diff --git a/misc/jenkins/bin/build.bash b/misc/jenkins/bin/build.bash
index af492c1..a997b5d 100755
--- a/misc/jenkins/bin/build.bash
+++ b/misc/jenkins/bin/build.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Script used jenkins to run builds for GnuPG and related packages.
 
 # Stop on error and be nice to other processes.

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

Summary of changes:
 misc/jenkins/bin/build.bash | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)


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




More information about the Gnupg-commits mailing list