Commit 4fbbcf00 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Add improvements for ARM as in CORAL


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19901 4525493e-7705-40b1-a816-d608a930855b
parent 800c97dc
......@@ -30,7 +30,12 @@ if [ ! -d logs ]; then
svnproj=lcgcool
fi
echo "WARNING! logs directory does not exist: check it out from $svnproj SVN"
svn co svn+ssh://svn.cern.ch/reps/${svnproj}/logs
klist > /dev/null 2>&1
if [ "$?" == "0" ]; then
svn co svn+ssh://svn.cern.ch/reps/${svnproj}/logs
else
svn co http://svn.cern.ch/guest/${svnproj}/logs
fi
if [ ! -d logs/cmake ]; then
echo "ERROR! logs/cmake is missing?"
exit 1
......@@ -77,9 +82,15 @@ fi
echo "=== make ${makevars}"
echo "Output is $out"
date >> $out
time make ${makevars} -j8 >> $out #2>&1
time make ${makevars} -j8 >> $out 2>&1 # redirect warnings from stderr
status=$?
if [ "$status" != "0" ]; then exit $status; fi
if [ "$status" != "0" ]; then
echo; echo "*** ERROR! make failed ***"; echo
if [ "${out#logs/}" != "$out" ]; then
grep -i error $out
fi
exit $status
fi
date >> $out
echo "=== make install"
echo "Output is $out"
......@@ -94,19 +105,22 @@ date >> $out
# [NB ccache does reproduce build warnings also for cached files!]
if [ "${out#logs/}" != "$out" ]; then
echo "=== [build warning search]"
ws=`grep warning $out`
grep warning $out > /dev/null 2>&1
if [ "$?" != "0" ]; then
echo "No build warnings found"
else
echo "WARNING! Build warnings found!"
echo $ws
grep warning $out
fi
fi
# TEMPORARY! Compare CMT and CMake based environments
pushd cmake > /dev/null
if [ -f .internal/compare_env.sh ]; then
.internal/compare_env.sh -i > .internal/env_comparison_install.txt
.internal/compare_env.sh > .internal/env_comparison_build.txt
# Skip this step if neither AFS nor CVMFS are available (e.g. on ARM)
if [ -d /afs ] || [ -d /cvmfs ]; then
pushd cmake > /dev/null
if [ -f .internal/compare_env.sh ]; then
.internal/compare_env.sh -i > .internal/env_comparison_install.txt
.internal/compare_env.sh > .internal/env_comparison_build.txt
fi
popd > /dev/null
fi
popd > /dev/null
......@@ -38,9 +38,12 @@ if [ "$trace" == "1" ]; then CMAKEFLAGS="--trace $CMAKEFLAGS"; fi
make ${makevars} configure 2>&1
# TEMPORARY! Compare CMT and CMake based environments
pushd cmake > /dev/null
if [ -f .internal/compare_env.sh ]; then
.internal/compare_env.sh -i > .internal/env_comparison_install.txt
.internal/compare_env.sh > .internal/env_comparison_build.txt
# Skip this step if neither AFS nor CVMFS are available (e.g. on ARM)
if [ -d /afs ] || [ -d /cvmfs ]; then
pushd cmake > /dev/null
if [ -f .internal/compare_env.sh ]; then
.internal/compare_env.sh -i > .internal/env_comparison_install.txt
.internal/compare_env.sh > .internal/env_comparison_build.txt
fi
popd > /dev/null
fi
popd > /dev/null
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment