You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2018/02/06 08:08:57 UTC
[6/7] kudu git commit: build-support: fix reporting of build
configuration
build-support: fix reporting of build configuration
Our older Jenkins setup for running flaky test builds seemed to use the
deprecated "build from the source root" setup with cmake. Now, we use a
build dir which isn't the same as the source root, which means we no
longer have a CMakeCache.txt in the source root.
This updates the test reporting to look for CMakeCache.txt in the proper
spot.
Change-Id: Ib6c131f46e75d2eb57d7e0ce9d2ad21e2ad9ab80
Reviewed-on: http://gerrit.cloudera.org:8080/9182
Tested-by: Kudu Jenkins
Reviewed-by: Hao Hao <ha...@cloudera.com>
Reviewed-by: Grant Henke <gr...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/6e5b1577
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/6e5b1577
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/6e5b1577
Branch: refs/heads/master
Commit: 6e5b15770ee223bfd225f384369b80e1b8475fa6
Parents: 7579da2
Author: Todd Lipcon <to...@apache.org>
Authored: Thu Feb 1 11:55:47 2018 -0800
Committer: Todd Lipcon <to...@apache.org>
Committed: Tue Feb 6 07:59:26 2018 +0000
----------------------------------------------------------------------
build-support/report-test.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/6e5b1577/build-support/report-test.sh
----------------------------------------------------------------------
diff --git a/build-support/report-test.sh b/build-support/report-test.sh
index e375c90..41351d2 100755
--- a/build-support/report-test.sh
+++ b/build-support/report-test.sh
@@ -54,11 +54,13 @@ if ! ( cd $ROOT && git diff --quiet . && git diff --cached --quiet . ) ; then
REVISION="${REVISION}-dirty"
fi
+BUILD_ROOT=$(dirname $TEST_EXECUTABLE)/..
+
# Parse out our "build config" - a space-separated list of tags
# which include the cmake build type as well as the list of configured
# sanitizers
-CMAKECACHE=$ROOT/CMakeCache.txt
+CMAKECACHE=$BUILD_ROOT/CMakeCache.txt
BUILD_CONFIG=$(grep '^CMAKE_BUILD_TYPE:' $CMAKECACHE | cut -f 2 -d=)
if grep -q "KUDU_USE_ASAN:UNINITIALIZED=1" $CMAKECACHE ; then
BUILD_CONFIG="$BUILD_CONFIG asan"