Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#74 - Fix failing build-mac pipeline job #77

Merged
merged 2 commits into from
Nov 25, 2024
Merged

#74 - Fix failing build-mac pipeline job #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48ab3ad
Initial implementation to fix errors.
currantw Nov 20, 2024
339e61c
Clarify comment in `run_cppcheck.sh`
currantw Nov 21, 2024
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
12 changes: 11 additions & 1 deletion run_cppcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ RESULTS_FILE=cppcheck-results.log
# --force: force checks all define combinations (default max is 12)
# -iaws-sdk-cpp: avoid checking AWS C++ SDK source files in our repo
# -UWIN32: do not check WIN32-defined codepaths; this would throw errors on Mac
cppcheck --force -iaws-sdk-cpp -UWIN32 ./src 2> ${RESULTS_FILE}
# --check-level: use exhaustive checking for pipeline jobs; should be set to `normal` during active development
# --inline-suppr: enable inline error suppression
# -i: ignore CMake and installed files

cppcheck \
--force -iaws-sdk-cpp -UWIN32 \
--check-level=exhaustive \
currantw marked this conversation as resolved.
Show resolved Hide resolved
--inline-suppr \
-i "src/vcpkg_installed" \
-i "src/cmake-build-debug" \
./src 2> ${RESULTS_FILE}

if [ -s ${RESULTS_FILE} ]; then
echo "!! Cppcheck errors found! Check ${RESULTS_FILE} for details."
Expand Down
3 changes: 3 additions & 0 deletions src/opensearchenlist/msdtc_enlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,10 @@ RETCODE static EnlistInDtc_1pipe(void *conn, ITransaction *pTra,
case DTC_CHECK_RM_CONNECTION:
if (!confirmingLink) {
confirmingLink = true;

// cppcheck-suppress unknownMacro
strcat(dtcname, ";" KEYWORD_DTC_CHECK "=0");
currantw marked this conversation as resolved.
Show resolved Hide resolved

continue;
}
default:
Expand Down
Loading