You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by da...@apache.org on 2016/01/13 20:59:35 UTC
incubator-kudu git commit: Use enable_devtoolset.sh in benchmark
scripts
Repository: incubator-kudu
Updated Branches:
refs/heads/master 9806863e7 -> 8ed68d7a5
Use enable_devtoolset.sh in benchmark scripts
Enabling the devtoolset is necessary when running on RHEL 6 systems.
Change-Id: If2548f7384a4080a95d6399946bbbb7bd097ea1f
Reviewed-on: http://gerrit.cloudera.org:8080/1776
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Dan Burkert <da...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/8ed68d7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/8ed68d7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/8ed68d7a
Branch: refs/heads/master
Commit: 8ed68d7a5eda93f567992f8501c36fcece6dce05
Parents: 9806863
Author: Dan Burkert <da...@cloudera.com>
Authored: Wed Jan 13 09:28:49 2016 -0800
Committer: Dan Burkert <da...@cloudera.com>
Committed: Wed Jan 13 19:55:08 2016 +0000
----------------------------------------------------------------------
src/kudu/scripts/benchmarks.sh | 4 ++--
src/kudu/scripts/tpch.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/8ed68d7a/src/kudu/scripts/benchmarks.sh
----------------------------------------------------------------------
diff --git a/src/kudu/scripts/benchmarks.sh b/src/kudu/scripts/benchmarks.sh
index 7ac845e..b580160 100755
--- a/src/kudu/scripts/benchmarks.sh
+++ b/src/kudu/scripts/benchmarks.sh
@@ -167,7 +167,7 @@ build_kudu() {
fi
# Build thirdparty
- thirdparty/build-if-necessary.sh
+ $BASE_DIR/build-support/enable_devtoolset.sh thirdparty/build-if-necessary.sh
# PATH=<thirdparty_stuff>:<toolchain_stuff>:$PATH
THIRDPARTY_BIN=$BASE_DIR/thirdparty/installed/bin
@@ -180,7 +180,7 @@ build_kudu() {
# Workaround for gperftools issue #497
export LD_BIND_NOW=1
- $THIRDPARTY_BIN/cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+ $BASE_DIR/build-support/enable_devtoolset.sh $THIRDPARTY_BIN/cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
make clean
# clean up before we run
rm -Rf /tmp/kudutpch1-$UID
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/8ed68d7a/src/kudu/scripts/tpch.sh
----------------------------------------------------------------------
diff --git a/src/kudu/scripts/tpch.sh b/src/kudu/scripts/tpch.sh
index d61751d..09dec47 100755
--- a/src/kudu/scripts/tpch.sh
+++ b/src/kudu/scripts/tpch.sh
@@ -89,7 +89,7 @@ if [ -f "$TOOLCHAIN" ]; then
fi
# Build thirdparty
-$ROOT/thirdparty/build-if-necessary.sh
+$ROOT/build-support/enable_devtoolset.sh $ROOT/thirdparty/build-if-necessary.sh
# PATH=<thirdparty_stuff>:<toolchain_stuff>:$PATH
THIRDPARTY_BIN=$(pwd)/thirdparty/installed/bin
@@ -102,7 +102,7 @@ BUILD_TYPE=release
# Workaround for gperftools issue #497
export LD_BIND_NOW=1
-$THIRDPARTY_BIN/cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+$ROOT/build-support/enable_devtoolset.sh $THIRDPARTY_BIN/cmake . -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
make clean
NUM_PROCS=$(cat /proc/cpuinfo | grep processor | wc -l)