Skip to content
This repository has been archived by the owner on Mar 22, 2023. It is now read-only.

tests: add suppression for memcheck #1263

Open
wants to merge 3 commits into
base: stable-1.13
Choose a base branch
from
Open
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
10 changes: 5 additions & 5 deletions .github/workflows/gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:

windows:
name: Windows
runs-on: windows-latest
runs-on: windows-2019

env:
platform: x64
Expand All @@ -119,18 +119,18 @@ jobs:
PMDK_VERSION: "1.9"
CMAKE_TOOLCHAIN_FILE: "C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
CMAKE_INSTALL_PREFIX: "C:\\install\\libpmemobj-cpp"
MSBUILD: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin"
strategy:
matrix:
BUILD_TYPE: [Debug, Release]
CXX_STANDARD: [14]
include:
- BUILD_TYPE: RelWithDebInfo
CXX_STANDARD: 17

steps:
- name: Update PATH
run: echo "${env:MSBUILD}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Setup MSBuild.exe
uses: microsoft/[email protected]
with:
msbuild-architecture: ${env:ARCH}

- name: Cache vcpkg packages
uses: actions/cache@v1
Expand Down
4 changes: 2 additions & 2 deletions tests/helpers.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2018-2021, Intel Corporation
# Copyright 2018-2022, Intel Corporation

set(DIR ${PARENT_DIR}/${TEST_NAME})

Expand Down Expand Up @@ -105,7 +105,7 @@ function(execute_common expect_success output_file name)
elseif(${TRACER} STREQUAL memcheck)
set(TRACE valgrind --error-exitcode=99 --tool=memcheck --leak-check=full
--suppressions=${TEST_ROOT_DIR}/ld.supp --suppressions=${TEST_ROOT_DIR}/memcheck-stdcpp.supp --suppressions=${TEST_ROOT_DIR}/memcheck-libunwind.supp
--suppressions=${TEST_ROOT_DIR}/memcheck-ndctl.supp)
--suppressions=${TEST_ROOT_DIR}/memcheck-ndctl.supp --suppressions=${TEST_ROOT_DIR}/memcheck.supp)
set(ENV{LIBPMEMOBJ_CPP_TRACER_MEMCHECK} 1)
elseif(${TRACER} STREQUAL helgrind)
set(TRACE valgrind --error-exitcode=99 --tool=helgrind --suppressions=${TEST_ROOT_DIR}/helgrind.supp)
Expand Down
7 changes: 7 additions & 0 deletions tests/memcheck.supp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
<string cmp vectorization, libpmemobj-cpp #1262>
Memcheck:Addr32
fun:__wmemcmp_avx2_movbe
fun:compare
...
}
6 changes: 3 additions & 3 deletions utils/docker/images/install-pmdk.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2018-2021, Intel Corporation
# Copyright 2018-2022, Intel Corporation

#
# install-pmdk.sh - installs libpmem & libpmemobj
Expand All @@ -16,8 +16,8 @@ fi

PACKAGE_MANAGER=${1}

# master: 1.11.0, 02.07.2021
PMDK_VERSION="8583fcfd68764ac6779e6f93db89b06971b26704"
# common: 1.12.0 release, 24.05.2022
PMDK_VERSION="73d8f958e855904dc0776a7d77d0f0d3698a65b1"

git clone https://github.com/pmem/pmdk
cd pmdk
Expand Down