projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: babeltrace: split gerrit jobs by branch
[lttng-ci.git]
/
scripts
/
lttng-tools
/
build.sh
diff --git
a/scripts/lttng-tools/build.sh
b/scripts/lttng-tools/build.sh
index 3b0eb9d6485a250aa8c4949be33a840eed0e1108..079de21030832a07793cea9ce70ebfdf065f0fbd 100755
(executable)
--- a/
scripts/lttng-tools/build.sh
+++ b/
scripts/lttng-tools/build.sh
@@
-281,11
+281,11
@@
cygwin|cygwin64|msys32|msys64)
;;
esac
;;
esac
-#
The missing-field-initializers warning code is very dumb in GCC 4.8 on
-#
SLES12 / EL7, disable it even if it's
available.
+#
Some warning flags are very dumb in GCC 4.8 on SLES12 / EL7, disable them
+#
even if they are
available.
if [[ $platform = sles12sp5* ]] || [[ $platform = el7* ]]; then
if [[ $platform = sles12sp5* ]] || [[ $platform = el7* ]]; then
- CFLAGS="$CFLAGS -Wno-missing-field-initializers"
- CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"
+ CFLAGS="$CFLAGS -Wno-missing-field-initializers
-Wno-shadow
"
+ CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers
-Wno-shadow
"
fi
case "$test_type" in
fi
case "$test_type" in
@@
-353,12
+353,19
@@
agents)
export JAVA_HOME="/usr/lib/jvm/default-java"
export CLASSPATH="$DEPS_JAVA/lttng-ust-agent-all.jar:/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
export JAVA_HOME="/usr/lib/jvm/default-java"
export CLASSPATH="$DEPS_JAVA/lttng-ust-agent-all.jar:/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
- CONF_OPTS+=("--enable-test-java-agent-all"
"--enable-test-python-agent-all"
)
+ CONF_OPTS+=("--enable-test-java-agent-all")
# Explicitly add '--enable-test-java-agent-log4j2', it's not part of '-all' in stable 2.12/2.13
if verlt "$PACKAGE_VERSION" "2.14"; then
CONF_OPTS+=("--enable-test-java-agent-log4j2")
fi
# Explicitly add '--enable-test-java-agent-log4j2', it's not part of '-all' in stable 2.12/2.13
if verlt "$PACKAGE_VERSION" "2.14"; then
CONF_OPTS+=("--enable-test-java-agent-log4j2")
fi
+
+ # Some distros don't ship python2 anymore
+ if command -v $PYTHON2 >/dev/null 2>&1; then
+ CONF_OPTS+=("--enable-test-python-agent-all")
+ else
+ CONF_OPTS+=("--enable-test-python3-agent")
+ fi
;;
relayd-only)
;;
relayd-only)
This page took
0.022868 seconds
and
4
git commands to generate.