summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2018-12-21 16:52:26 +0100
committerOliver Smith <osmith@sysmocom.de>2018-12-21 16:58:30 +0100
commit5e00d6fd805f71fc0f8cea5cb26cf1a023b6cbb0 (patch)
tree5be5e1e8a06ec71b73d7dd1c1a3c565c4a5e55cd
parentf0eeca5cb3bfc2fed819eb46c7b34dd8879bfa4e (diff)
Revert "jenkins.sh: disable parallel build"HEADmaster
This reverts commit a352642587d8835deb3c6f55da7986f427835157. I've confused the libasn1c and asn1c repositories. libasn1c does not need this workaround, asn1c does. Related Change-Id: I80eecc60b96e87710218089dfdd1a3f87b40a8b1 (asn1c) Change-Id: I73eac905524688939e133b6f91ad85514dc0393a
-rwxr-xr-xcontrib/jenkins.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index dbdfda6..7d68736 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -14,10 +14,7 @@ set -x
autoreconf --install --force
./configure --enable-werror
-
-# Parallel make is disabled due to a race condition. On Jenkins, it often
-# aborts the build with: "asn1p_y.y:357:13: error: 'param' undeclared"
-$MAKE -j1
+$MAKE $PARALLEL_MAKE
$MAKE distcheck \
|| cat-testlogs.sh