commit e0ab3f93cdfe1f0cbe9e730521b7dd0b30bd6238
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Oct 20 13:29:39 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Oct 20 13:31:43 2016 -0700
tree c0cc6566bccb5cc368703784e13e2448ee0e692f
parent ac541b113a5f75588337ca666f11f6c0359011af

ci: Update CI scripts

The changes in Boost 1.62 broke command-line invocation of unit tests

Change-Id: Id98d00f5f85b2154981dec859c8c5a671ec06c84

.jenkins.d/util.sh

diff --git a/.jenkins.d/util.sh b/.jenkins.d/util.sh
index 81c8931..a89bc27 100755
--- a/.jenkins.d/util.sh
+++ b/.jenkins.d/util.sh
@@ -1,9 +1,18 @@
 has() {
+    local saved_xtrace
+    [[ $- == *x* ]] && saved_xtrace=-x || saved_xtrace=+x
+    set +x
+
     local p=$1
     shift
-    local x
-    for x in "$@"; do
-        [[ "${x}" == "${p}" ]] && return 0
+    local i ret=1
+    for i in "$@"; do
+        if [[ "${i}" == "${p}" ]]; then
+            ret=0
+            break
+        fi
     done
-    return 1
+
+    set ${saved_xtrace}
+    return ${ret}
 }