Skip to content

Commit ef4bd04

Browse files
authored
Merge pull request #128 from kutschke/cleanupDebugging
Removed most debugging printout and retained just the minimum.
2 parents 726ca65 + e025a55 commit ef4bd04

2 files changed

Lines changed: 0 additions & 17 deletions

File tree

bin/github/jenkins_tests/mu2e-offline-build-test/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ function do_setupstep() {
66

77
source /cvmfs/mu2e.opensciencegrid.org/setupmu2e-art.sh
88
if [ "$MU2E_SPACK" ]; then
9-
echo "[$(date)] Check run-clang-tidy " `command -v run-clang-tidy`
109
HH=$(spack find --format "{version} {hash:7}" codetools | sort -rn | head -1 | awk '{print $2}' )
1110
echo "[$(date)] found codetools hash $HH"
1211
spack load codetools/$HH || exit 1
1312
unset HH
1413

15-
echo "[$(date)] spack load llvm/ztl5ab2 " `command -v clang-tidy`
1614
H1=$(spack find --format "{version} {hash:7}" llvm | sort -rn | head -1 | awk '{print $2}' )
1715
echo "[$(date)] found llvm hash $H1"
1816
spack load llvm/$H1 || exit 1
1917
unset H1
2018

21-
echo "[$(date)] spack load llvm/"$H1" - success " `command -v clang-tidy`
22-
echo "[$(date)] clang-tidy --version" `clang-tidy --version`
2319
else
2420
setup codetools
2521
fi

bin/github/jenkins_tests/mu2e-offline-build-test/job.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -192,25 +192,12 @@ else
192192
if [ "$MU2E_SPACK" ]; then
193193

194194
source /cvmfs/mu2e.opensciencegrid.org/setupmu2e-art.sh
195-
echo "[$(date)] testing1 for clang tidy: " `command -v clang-tidy`
196195
H1=$(spack find --format "{version} {hash:7}" llvm | sort -rn | head -1 | awk '{print $2}' )
197196
echo "[$(date)] clang-tidy step found llvm hash $H1"
198197
spack load llvm/$H1 || exit 1
199198
unset H1
200199
muse setup -q $BUILDTYPE
201200

202-
203-
#if ! command -v clang-tidy >/dev/null ; then
204-
# spack load llvm/ztl5ab2 || exit 1
205-
#fi
206-
echo "[$(date)] testing2 for clang tidy: " `command -v clang-tidy`
207-
echo "[$(date)] BUILDTYPE: " ${BUILDTYPE}
208-
echo "[$(date)] MUSE_BUILD_DIR: " ${MUSE_BUILD_DIR}
209-
echo "[$(date)] MUSE_BUILD_BASE: " ${MUSE_BUILD_BASE}
210-
echo "[$(date)] CT_FILES: " ${CT_FILES}
211-
echo "[$(date)] clang-tidy --version" `clang-tidy --version`
212-
#cp build/*/compile_commands.json .
213-
#run-clang-tidy ${CT_FILES} > $WORKSPACE/clang-tidy.log || exit 1
214201
run-clang-tidy -p $MUSE_BUILD_DIR ${CT_FILES} > $WORKSPACE/clang-tidy.log || exit 1
215202

216203
else

0 commit comments

Comments
 (0)