revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

removed unused log statements

Browse source
This commit is contained in:
Christian Kühnel 2019-11-18 17:30:11 +01:00
parent 560ff37626
commit 4d4ea1fffb
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Jenkins/Phabricator-pipeline/Jenkinsfile vendored
View file

@ -75,6 +75,7 @@ pipeline {
// copy console log to result folder // copy console log to result folder
sh "wget -qO console-log.txt http://jenkins-ui.jenkins.svc.cluster.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText" sh "wget -qO console-log.txt http://jenkins-ui.jenkins.svc.cluster.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText"
// keep a copy of the answer from Phabricator for debugging // keep a copy of the answer from Phabricator for debugging
// TODO: move all file copy operations here
sh """ sh """
set -eu set -eu
if [ -f "${DIFF_JSON}" ]; then if [ -f "${DIFF_JSON}" ]; then

1
Jenkins/master-pipeline/Jenkinsfile vendored
View file

@ -57,6 +57,7 @@ pipeline {
dir("${env.TARGET_DIR}") { dir("${env.TARGET_DIR}") {
// copy console log to result folder // copy console log to result folder
sh "wget -qO console-log.txt http://jenkins-ui.jenkins.svc.cluster.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText" sh "wget -qO console-log.txt http://jenkins-ui.jenkins.svc.cluster.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText"
// TODO: move all file copy operations here
} }
} }
} }

6
scripts/run_cmake.sh
View file

@ -23,6 +23,7 @@ export CC=clang-8
export CXX=clang++-8 export CXX=clang++-8
export LD=LLD export LD=LLD
#TODO: move this to the pipeline
TARGET_DIR="/mnt/nfs/results/${JOB_BASE_NAME}-${BUILD_NUMBER}" TARGET_DIR="/mnt/nfs/results/${JOB_BASE_NAME}-${BUILD_NUMBER}"
mkdir -p ${TARGET_DIR} mkdir -p ${TARGET_DIR}
@ -31,10 +32,11 @@ cmake -GNinja ../llvm -DCMAKE_BUILD_TYPE=Release -D LLVM_ENABLE_LLD=ON \
-D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra;libcxx;libcxxabi;lld;libunwind" \ -D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra;libcxx;libcxxabi;lld;libunwind" \
-D LLVM_CCACHE_BUILD=ON -D LLVM_CCACHE_DIR="${CCACHE_PATH}" -D LLVM_CCACHE_MAXSIZE=20G \ -D LLVM_CCACHE_BUILD=ON -D LLVM_CCACHE_DIR="${CCACHE_PATH}" -D LLVM_CCACHE_MAXSIZE=20G \
-D LLVM_ENABLE_ASSERTIONS=ON -DCMAKE_CXX_FLAGS=-gmlt \ -D LLVM_ENABLE_ASSERTIONS=ON -DCMAKE_CXX_FLAGS=-gmlt \
-DLLVM_LIT_ARGS="-v --xunit-xml-output ${WORKSPACE}/build/test-results.xml" 2>&1 | tee -a cmake-log.txt -DLLVM_LIT_ARGS="-v --xunit-xml-output ${WORKSPACE}/build/test-results.xml"
RETURN_CODE="${PIPESTATUS[0]}" RETURN_CODE="${PIPESTATUS[0]}"
set -e set -e
cp cmake-log.txt CMakeCache.txt ${TARGET_DIR} #TODO: move this to the Pipeline
cp CMakeCache.txt ${TARGET_DIR}
echo "CMake completed ======================================" echo "CMake completed ======================================"
exit ${RETURN_CODE} exit ${RETURN_CODE}

7
scripts/run_ninja.sh
View file

@ -17,6 +17,7 @@ set -eu
CMD=$1 CMD=$1
echo "Running ${CMD}... =====================================" echo "Running ${CMD}... ====================================="
cd ${WORKSPACE} cd ${WORKSPACE}
# TODO: move copy operation to pipeline
BUILD_ID="${JOB_BASE_NAME}-${BUILD_NUMBER}" BUILD_ID="${JOB_BASE_NAME}-${BUILD_NUMBER}"
TARGET_DIR="/mnt/nfs/results/${BUILD_ID}" TARGET_DIR="/mnt/nfs/results/${BUILD_ID}"
@ -24,12 +25,12 @@ ulimit -n 8192
cd build cd build
set +e set +e
ninja ${CMD} 2>&1 | tee -a ninja_${CMD}-log.txt ninja ${CMD}
RETURN_CODE="${PIPESTATUS[0]}" RETURN_CODE="$?"
set -e set -e
echo "check-all completed ======================================" echo "check-all completed ======================================"
cp ninja_${CMD}-log.txt ${TARGET_DIR} # TODO: move copy operation to pipeline
if test -f "test-results.xml" ; then if test -f "test-results.xml" ; then
cp test-results.xml ${TARGET_DIR} cp test-results.xml ${TARGET_DIR}
fi fi