Holger Freyther has uploaded this change for review. (
https://gerrit.osmocom.org/11065
Change subject: Be able to switch-off ASAN builds of our binaries.
......................................................................
Be able to switch-off ASAN builds of our binaries.
Inroduce a way to not take a 2x performance hit when testing. It
is of importance if we run with hundreds of BTSes and 10k+ subscribers.
In the absence of using getops or shflags use an environment for it.
Change-Id: I540ba1c35e8fb72abcee0d86e0bdc1136b47345c
---
M contrib/jenkins-build-common.sh
M contrib/jenkins-build-osmo-bsc.sh
M contrib/jenkins-build-osmo-bts.sh
M contrib/jenkins-build-osmo-ggsn.sh
M contrib/jenkins-build-osmo-hlr.sh
M contrib/jenkins-build-osmo-iuh.sh
M contrib/jenkins-build-osmo-mgw.sh
M contrib/jenkins-build-osmo-msc.sh
M contrib/jenkins-build-osmo-pcu.sh
M contrib/jenkins-build-osmo-sgsn.sh
M contrib/jenkins-build-osmo-stp.sh
M contrib/jenkins-build-osmocom-bb.sh
12 files changed, 55 insertions(+), 51 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/65/11065/1
diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index f4198d0..f9b9193 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -49,6 +49,10 @@
# osmo-bts within the sysmoBTS SDK
prefix_real="${prefix_real-"$prefix"}"
+# Flag to be used to enable ASAN in builds. Defaults to enable ASAN builds and
+# it can be disabled by passing SANITIZE_FLAGS="" to the build.
+SANITIZE_FLAGS="${SANITIZE_FLAGS---enable-sanitize}"
+
export PKG_CONFIG_PATH="$prefix_real/lib/pkgconfig:$PKG_CONFIG_PATH"
export LD_LIBRARY_PATH="$prefix_real/lib:$LD_LIBRARY_PATH"
diff --git a/contrib/jenkins-build-osmo-bsc.sh
b/contrib/jenkins-build-osmo-bsc.sh
index 4081a00..5d4d333 100755
--- a/contrib/jenkins-build-osmo-bsc.sh
+++ b/contrib/jenkins-build-osmo-bsc.sh
@@ -4,11 +4,11 @@
name="osmo-bsc"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo libosmo-netif --enable-sanitize --disable-doxygen
-build_repo libosmo-sccp --enable-sanitize
-build_repo osmo-mgw --enable-sanitize
-build_repo osmo-bsc --enable-sanitize
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-sccp ${SANITIZE_FLAGS}
+build_repo osmo-mgw ${SANITIZE_FLAGS}
+build_repo osmo-bsc ${SANITIZE_FLAGS}
create_bin_tgz "osmo-bsc abisip-find ipaccess-config"
diff --git a/contrib/jenkins-build-osmo-bts.sh
b/contrib/jenkins-build-osmo-bts.sh
index e5fab5d..46a1c11 100755
--- a/contrib/jenkins-build-osmo-bts.sh
+++ b/contrib/jenkins-build-osmo-bts.sh
@@ -6,8 +6,8 @@
have_repo octphy-2g-headers
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo osmo-bts --enable-sanitize --enable-trx
--with-openbsc=$base/openbsc/openbsc/include --enable-octphy
--with-octsdr-2g=$base/octphy-2g-headers
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx
--with-openbsc=$base/openbsc/openbsc/include --enable-octphy
--with-octsdr-2g=$base/octphy-2g-headers
create_bin_tgz "osmo-bts-trx osmo-bts-octphy"
diff --git a/contrib/jenkins-build-osmo-ggsn.sh
b/contrib/jenkins-build-osmo-ggsn.sh
index a2cf952..fec2633 100755
--- a/contrib/jenkins-build-osmo-ggsn.sh
+++ b/contrib/jenkins-build-osmo-ggsn.sh
@@ -4,7 +4,7 @@
name="osmo-ggsn"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo osmo-ggsn --enable-sanitize
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo osmo-ggsn ${SANITIZE_FLAGS}
create_bin_tgz osmo-ggsn
diff --git a/contrib/jenkins-build-osmo-hlr.sh
b/contrib/jenkins-build-osmo-hlr.sh
index 3229e52..0b60955 100755
--- a/contrib/jenkins-build-osmo-hlr.sh
+++ b/contrib/jenkins-build-osmo-hlr.sh
@@ -4,8 +4,8 @@
name="osmo-hlr"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo osmo-hlr --enable-sanitize
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo osmo-hlr ${SANITIZE_FLAGS}
create_bin_tgz osmo-hlr
diff --git a/contrib/jenkins-build-osmo-iuh.sh
b/contrib/jenkins-build-osmo-iuh.sh
index 03295f9..e8e7fa8 100755
--- a/contrib/jenkins-build-osmo-iuh.sh
+++ b/contrib/jenkins-build-osmo-iuh.sh
@@ -4,12 +4,12 @@
name="osmo-iuh"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo libosmo-netif --enable-sanitize --disable-doxygen
-build_repo libosmo-sccp --enable-sanitize
-build_repo libasn1c --enable-sanitize
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-sccp ${SANITIZE_FLAGS}
+build_repo libasn1c ${SANITIZE_FLAGS}
-build_repo osmo-iuh --enable-sanitize
+build_repo osmo-iuh ${SANITIZE_FLAGS}
create_bin_tgz "osmo-hnbgw"
diff --git a/contrib/jenkins-build-osmo-mgw.sh
b/contrib/jenkins-build-osmo-mgw.sh
index 5c1ce74..a04e0ca 100755
--- a/contrib/jenkins-build-osmo-mgw.sh
+++ b/contrib/jenkins-build-osmo-mgw.sh
@@ -4,9 +4,9 @@
name="osmo-mgw"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo libosmo-netif --enable-sanitize --disable-doxygen
-build_repo osmo-mgw --enable-sanitize
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen
+build_repo osmo-mgw ${SANITIZE_FLAGS}
create_bin_tgz "osmo-mgw"
diff --git a/contrib/jenkins-build-osmo-msc.sh
b/contrib/jenkins-build-osmo-msc.sh
index b614052..c64f94d 100755
--- a/contrib/jenkins-build-osmo-msc.sh
+++ b/contrib/jenkins-build-osmo-msc.sh
@@ -4,15 +4,15 @@
name="osmo-msc"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo libosmo-netif --enable-sanitize --disable-doxygen
-build_repo libsmpp34 --enable-sanitize
-build_repo libosmo-sccp --enable-sanitize
-build_repo osmo-mgw --enable-sanitize
-build_repo osmo-hlr --enable-sanitize
-build_repo libasn1c --enable-sanitize
-build_repo osmo-iuh --enable-sanitize
-build_repo osmo-msc --enable-sanitize --enable-smpp --enable-iu
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libsmpp34 ${SANITIZE_FLAGS}
+build_repo libosmo-sccp ${SANITIZE_FLAGS}
+build_repo osmo-mgw ${SANITIZE_FLAGS}
+build_repo osmo-hlr ${SANITIZE_FLAGS}
+build_repo libasn1c ${SANITIZE_FLAGS}
+build_repo osmo-iuh ${SANITIZE_FLAGS}
+build_repo osmo-msc ${SANITIZE_FLAGS} --enable-smpp --enable-iu
create_bin_tgz osmo-msc
diff --git a/contrib/jenkins-build-osmo-pcu.sh
b/contrib/jenkins-build-osmo-pcu.sh
index 3d3fdd0..1877f9c 100755
--- a/contrib/jenkins-build-osmo-pcu.sh
+++ b/contrib/jenkins-build-osmo-pcu.sh
@@ -4,7 +4,7 @@
name="osmo-pcu"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-pcsc --disable-doxygen
-build_repo osmo-pcu --enable-sanitize
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-pcsc --disable-doxygen
+build_repo osmo-pcu ${SANITIZE_FLAGS}
create_bin_tgz osmo-pcu
diff --git a/contrib/jenkins-build-osmo-sgsn.sh
b/contrib/jenkins-build-osmo-sgsn.sh
index 87aed76..ffa787c 100755
--- a/contrib/jenkins-build-osmo-sgsn.sh
+++ b/contrib/jenkins-build-osmo-sgsn.sh
@@ -4,13 +4,13 @@
name="osmo-sgsn"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo libosmo-netif --enable-sanitize --disable-doxygen
-build_repo libosmo-sccp --enable-sanitize
-build_repo osmo-ggsn --enable-sanitize
-build_repo libasn1c --enable-sanitize
-build_repo osmo-iuh --enable-sanitize
-build_repo osmo-sgsn --enable-sanitize --enable-iu
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-sccp ${SANITIZE_FLAGS}
+build_repo osmo-ggsn ${SANITIZE_FLAGS}
+build_repo libasn1c ${SANITIZE_FLAGS}
+build_repo osmo-iuh ${SANITIZE_FLAGS}
+build_repo osmo-sgsn ${SANITIZE_FLAGS} --enable-iu
create_bin_tgz osmo-sgsn
diff --git a/contrib/jenkins-build-osmo-stp.sh
b/contrib/jenkins-build-osmo-stp.sh
index 985b090..5f9c421 100755
--- a/contrib/jenkins-build-osmo-stp.sh
+++ b/contrib/jenkins-build-osmo-stp.sh
@@ -4,9 +4,9 @@
name="osmo-stp"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --enable-sanitize --disable-doxygen
-build_repo libosmo-abis --enable-sanitize
-build_repo libosmo-netif --enable-sanitize --disable-doxygen
-build_repo libosmo-sccp --enable-sanitize
+build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-abis ${SANITIZE_FLAGS}
+build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen
+build_repo libosmo-sccp ${SANITIZE_FLAGS}
create_bin_tgz osmo-stp
diff --git a/contrib/jenkins-build-osmocom-bb.sh
b/contrib/jenkins-build-osmocom-bb.sh
index e968a1a..827fc94 100755
--- a/contrib/jenkins-build-osmocom-bb.sh
+++ b/contrib/jenkins-build-osmocom-bb.sh
@@ -8,9 +8,9 @@
FW_RPM_URL="http://download.opensuse.org/repositories/home:/mnhauke:/osmocom:/nightly/SLE_15/x86_64/";
build_repo libosmocore --disable-doxygen
-build_repo_dir osmocom-bb src/host/virt_phy --enable-sanitize
-build_repo_dir osmocom-bb src/host/osmocon --enable-sanitize
-build_repo_dir osmocom-bb src/host/layer23 --enable-sanitize
+build_repo_dir osmocom-bb src/host/virt_phy ${SANITIZE_FLAGS}
+build_repo_dir osmocom-bb src/host/osmocon ${SANITIZE_FLAGS}
+build_repo_dir osmocom-bb src/host/layer23 ${SANITIZE_FLAGS}
mkdir -p "$prefix"
cd "$prefix"
--
To view, visit https://gerrit.osmocom.org/11065
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I540ba1c35e8fb72abcee0d86e0bdc1136b47345c
Gerrit-Change-Number: 11065
Gerrit-PatchSet: 1
Gerrit-Owner: Holger Freyther <[email protected]>
