Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Utilities/ReleaseScripts/test/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<test name="test-clang-tidy" command="test-clang-tidy.sh">
<use name="llvm"/>
</test>
<test name="test-scram-code-checks" command="test-scram-code-checks.sh">
<use name="cmssw-config"/>
<use name="llvm"/>
</test>
<ifrelease name="!ASAN">
<test name="TestValgrind" command="test-valgrind.sh">
<flags PRE_TEST="test-valgrind-memleak"/>
Expand Down
31 changes: 31 additions & 0 deletions Utilities/ReleaseScripts/test/ref/test-clang-tidy.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
class BaseClass {
public:
BaseClass(int x) {
m_x = x;
ch = nullptr;
};
virtual ~BaseClass();
virtual int someMethod();

protected:
int m_x;
char* ch;
};

BaseClass::~BaseClass() {
if (ch != nullptr) {
delete ch;
ch = nullptr;
}
}
int BaseClass::someMethod() { return m_x; }

class DrivedClass : public BaseClass {
public:
DrivedClass(int x) : BaseClass(x) {};
~DrivedClass() override;
int someMethod() override;
};

DrivedClass::~DrivedClass() {}
int DrivedClass::someMethod() { return m_x * 2; }
2 changes: 1 addition & 1 deletion Utilities/ReleaseScripts/test/test-clang-tidy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int BaseClass::someMethod() { return m_x; }

class DrivedClass : public BaseClass {
public:
DrivedClass(int x) : BaseClass(x){};
DrivedClass(int x) : BaseClass(x) {};
virtual ~DrivedClass();
virtual int someMethod();
};
Expand Down
12 changes: 6 additions & 6 deletions Utilities/ReleaseScripts/test/test-clang-tidy.cc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,28 @@ Diagnostics:
DiagnosticMessage:
Message: 'prefer using ''override'' or (rarely) ''final'' instead of ''virtual'''
FilePath: 'Utilities/ReleaseScripts/test/test-clang-tidy.cc'
FileOffset: 385
FileOffset: 386
Replacements:
- FilePath: 'Utilities/ReleaseScripts/test/test-clang-tidy.cc'
Offset: 377
Offset: 378
Length: 8
ReplacementText: ''
- FilePath: 'Utilities/ReleaseScripts/test/test-clang-tidy.cc'
Offset: 399
Offset: 400
Length: 0
ReplacementText: ' override'
- DiagnosticName: modernize-use-override
DiagnosticMessage:
Message: 'prefer using ''override'' or (rarely) ''final'' instead of ''virtual'''
FilePath: 'Utilities/ReleaseScripts/test/test-clang-tidy.cc'
FileOffset: 415
FileOffset: 416
Replacements:
- FilePath: 'Utilities/ReleaseScripts/test/test-clang-tidy.cc'
Offset: 403
Offset: 404
Length: 8
ReplacementText: ''
- FilePath: 'Utilities/ReleaseScripts/test/test-clang-tidy.cc'
Offset: 427
Offset: 428
Length: 0
ReplacementText: ' override'
...
38 changes: 38 additions & 0 deletions Utilities/ReleaseScripts/test/test-scram-code-checks.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash -ex

ORIG_TEST_PATH=$SCRAM_TEST_PATH
scram project $CMSSW_VERSION
cd $CMSSW_VERSION

#Get FWCore/Version
mkdir src/FWCore
RefDir=$CMSSW_BASE/src/FWCore/Version
[ -e $RefDir ] || RefDir=$CMSSW_RELEASE_BASE/src/FWCore/Version
rsync -a --no-g $RefDir/ src/FWCore/Version/
chmod -R u+w src/FWCore/Version

#Get latest clang-tidy and format files
RefDir=$CMSSW_BASE/src
[ -e ${RefDir}/.clang-tidy ] || RefDir=$CMSSW_RELEASE_BASE/src
cp ${RefDir}/.clang-tidy src/
cp ${RefDir}/.clang-format src/

#Get latest build rules
rm -rf config/SCRAM
rsync -a $CMSSW_BASE/config/SCRAM/ config/SCRAM/

#Make sure external release external lib/bin are in env
chmod a-x config/SCRAM/hooks/runtime/50-remove-release-external-lib

#Test clang-tidy
cp $ORIG_TEST_PATH/test-clang-tidy.cc src/FWCore/Version/src
USER_CODE_CHECKS_FILES=src/FWCore/Version/src/test-clang-tidy.cc scram b code-checks
diff -u src/FWCore/Version/src/test-clang-tidy.cc $ORIG_TEST_PATH/ref/test-clang-tidy.cc
cp $ORIG_TEST_PATH/test-clang-tidy.cc src/FWCore/Version/src
scram b code-checks-all
diff -u src/FWCore/Version/src/test-clang-tidy.cc $ORIG_TEST_PATH/ref/test-clang-tidy.cc

#Test clang-format
sed -i -e 's|int m_x| int m_x |' src/FWCore/Version/src/test-clang-tidy.cc
USER_CODE_FORMAT_FILES=src/FWCore/Version/src/test-clang-tidy.cc scram b code-format
diff -u src/FWCore/Version/src/test-clang-tidy.cc $ORIG_TEST_PATH/ref/test-clang-tidy.cc