From 0d30552d011c2049f09d57de82873d93959438c5 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 10 Jul 2019 17:23:37 -0400 Subject: [PATCH] jjb: Enable python in bt2 'std' config The bt2 test suite is mostly useless without the python bindings, build them by default in the 'std' config on all platforms and add a 'min' config on the linux job to test this scenario. Remove the 'python-bindings' config for bt2 since it's now part of the default. Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 10 +++++----- scripts/babeltrace/build.sh | 14 +++++++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index c6f502a..4101815 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -630,27 +630,27 @@ buildtype: build arch: !!python/tuple [amd64] build: !!python/tuple [std, oot, dist] - conf: !!python/tuple [std, static, python-bindings, production] + conf: !!python/tuple [std, static, prod, min] - 'babeltrace_{version}_{buildtype}': buildtype: portbuild arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std] - conf: !!python/tuple [std, python-bindings] + conf: !!python/tuple [std, prod] - 'babeltrace_{version}_{buildtype}': buildtype: slesbuild arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] - conf: !!python/tuple [std] + conf: !!python/tuple [std, prod] - 'babeltrace_{version}_{buildtype}': buildtype: macosxbuild arch: !!python/tuple [macosx] build: !!python/tuple [std] - conf: !!python/tuple [std, python-bindings, production] + conf: !!python/tuple [std, prod] - 'babeltrace_{version}_{cctype}': cctype: clangbuild arch: !!python/tuple [amd64] build: !!python/tuple [std] - conf: !!python/tuple [std, static] + conf: !!python/tuple [std, static, prod] cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] - 'babeltrace_{version}_winbuild': arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64] diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 92c47ed..fbf05c4 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -222,7 +222,7 @@ python-bindings) CONF_OPTS="${CONF_OPTS} --enable-python-bindings-doc --enable-python-plugins" fi ;; -production) +prod) echo "Production build" # Unset the developper variables @@ -235,9 +235,21 @@ production) export PYTHON_CONFIG="python3-config" CONF_OPTS="--enable-python-bindings --enable-python-bindings-doc --enable-python-plugins" ;; +min) + echo "Minimal build" + CONF_OPTS="" + ;; *) echo "Standard build" CONF_OPTS="" + + # Enable the python bindings / plugins by default with babeltrace2 + # the test suite is mostly useless without it. + if vergte "$PACKAGE_VERSION" "2.0"; then + export PYTHON="python3" + export PYTHON_CONFIG="python3-config" + CONF_OPTS="${CONF_OPTS} --enable-python-bindings --enable-python-bindings-doc --enable-python-plugins" + fi ;; esac -- 2.34.1