-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add more tests for edmCheckClassVersion, and fix an a problem with -g…
… option
- Loading branch information
Showing
6 changed files
with
89 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
#!/bin/bash -e | ||
|
||
SCRAM_TEST_NAME=TestFWCoreReflectionCheckClassVersionUpdate | ||
rm -rf $SCRAM_TEST_NAME | ||
mkdir $SCRAM_TEST_NAME | ||
cd $SCRAM_TEST_NAME | ||
|
||
# Create a new CMSSW dev area and build modified DataFormats/TestObjects in it | ||
NEW_CMSSW_BASE=$(/bin/pwd -P)/$CMSSW_VERSION | ||
scram -a $SCRAM_ARCH project $CMSSW_VERSION | ||
pushd $CMSSW_VERSION/src | ||
|
||
# Copy FWCore/Reflection code to be able to edit it to make ROOT header parsing to fail | ||
for DIR in ${CMSSW_BASE} ${CMSSW_RELEASE_BASE} ${CMSSW_FULL_RELEASE_BASE} ; do | ||
if [ -d ${DIR}/src/FWCore/Reflection ]; then | ||
mkdir FWCore | ||
cp -Lr ${DIR}/src/FWCore/Reflection FWCore/ | ||
break | ||
fi | ||
done | ||
if [ ! -e FWCore/Reflection ]; then | ||
echo "Failed to symlink FWCore/Reflection from local or release area" | ||
exit 1; | ||
fi | ||
|
||
# Modify the IntObject class to trigger a new version | ||
# | ||
# Just setting USER_CXXFLAGS for scram is not sufficient,because | ||
# somehow ROOT (as used by edmCheckClassVersion) still picks up the | ||
# version 3 of the class | ||
sed -i '1s/^/#define FWCORE_REFLECTION_TEST_INTOBJECT_V4\n/' FWCore/Reflection/test/stubs/TestObjects.h | ||
|
||
|
||
#Set env and build in sub-shel | ||
(eval $(scram run -sh) ; scram build -v -j $(nproc)) | ||
|
||
popd | ||
|
||
# Prepend NEW_CMSSW_BASE's lib/src paths in to LD_LIBRARY_PATH and ROOT_INCLUDE_PATH | ||
export LD_LIBRARY_PATH=${NEW_CMSSW_BASE}/lib/${SCRAM_ARCH}:${LD_LIBRARY_PATH} | ||
export ROOT_INCLUDE_PATH=${NEW_CMSSW_BASE}/src:${ROOT_INCLUDE_PATH} | ||
|
||
# Make the actual test | ||
echo "Initial setup complete, now for the actual test" | ||
XMLPATH=${SCRAM_TEST_PATH}/stubs | ||
LIBFILE=libFWCoreReflectionTestObjects.so | ||
|
||
function die { echo Failure $1: status $2 ; exit $2 ; } | ||
function runFailure { | ||
edmCheckClassVersion -l ${LIBFILE} -x ${XMLPATH}/$1 > log.txt && die "edmCheckClassVersion for $1 did not fail" 1 | ||
grep -q "$2" log.txt | ||
RET=$? | ||
if [ "$RET" != "0" ]; then | ||
echo "edmCheckClassVersion for $1 did not contain '$2', log is below" | ||
cat log.txt | ||
exit 1 | ||
fi | ||
} | ||
|
||
runFailure classes_def.xml "error: class 'edmtest::reflection::IntObject' has a different checksum for ClassVersion 3. Increment ClassVersion to 4 and assign it to checksum 2954816125" | ||
runFailure test_def_incorrectVersion.xml "error: for class 'edmtest::reflection::IntObject' ROOT says the ClassVersion is 3 but classes_def.xml says it is 4. Are you sure everything compiled correctly?" | ||
|
||
edmCheckClassVersion -l ${LIBFILE} -x ${XMLPATH}/classes_def.xml -g || die "edmCheckClassVersion -g failed" $? | ||
diff -u ${XMLPATH}/test_def_v4.xml classes_def.xml.generated || die "classes_def.xml.generated differs from expectation" $? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<lcgdict> | ||
<class name="edmtest::reflection::IntObject" ClassVersion="4"> | ||
<version ClassVersion="4" checksum="2954816125"/> | ||
<version ClassVersion="3" checksum="427917710"/> | ||
</class> | ||
<class name="edm::Wrapper<edmtest::reflection::IntObject>"/> | ||
</lcgdict> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<lcgdict> | ||
<class name="edmtest::reflection::IntObject" ClassVersion="4"> | ||
<version ClassVersion="4" checksum="2954816125"/> | ||
<version ClassVersion="3" checksum="427917710"/> | ||
</class> | ||
<class name="edm::Wrapper<edmtest::reflection::IntObject>"/> | ||
</lcgdict> |