projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: coverity: fix curl with scan.coverity.com broken ssl chain
[lttng-ci.git]
/
scripts
/
lttng-tools
/
build.sh
diff --git
a/scripts/lttng-tools/build.sh
b/scripts/lttng-tools/build.sh
index 36c87b0f9d9d5dcf411c4ff0c9825d077247e511..dded5f1efeda0b555474c8e6f92d3c6aa069103f 100755
(executable)
--- a/
scripts/lttng-tools/build.sh
+++ b/
scripts/lttng-tools/build.sh
@@
-102,6
+102,8
@@
UST_JAVA="$WORKSPACE/deps/lttng-ust/build/share/java/"
BABEL_LIBS="$WORKSPACE/deps/babeltrace/build/lib/"
BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/"
BABEL_LIBS="$WORKSPACE/deps/babeltrace/build/lib/"
BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/"
+# pgrep
+PGREP=pgrep
# Set platform variables
case "$arch" in
# Set platform variables
case "$arch" in
@@
-339,13
+341,6
@@
if [ "$RUN_TESTS" = "yes" ]; then
# Allow core dumps
ulimit -c unlimited
# Allow core dumps
ulimit -c unlimited
- # Kill any LTTng-related process
- lttng_processes="$("$PGREP" -l 'lttng|gen-ust-.+')"
- if [ $? -eq 0 ]; then
- pids="$(cut -d ' ' -f 1 <<< "$lttng_processes" | tr '\n' ' ')"
- kill -9 $pids
- fi
-
# Add 'babeltrace' binary to PATH
chmod +x "$BABEL_BINS/babeltrace"
export PATH="$PATH:$BABEL_BINS"
# Add 'babeltrace' binary to PATH
chmod +x "$BABEL_BINS/babeltrace"
export PATH="$PATH:$BABEL_BINS"
This page took
0.022744 seconds
and
4
git commands to generate.