From f17767647e588ebd0be9cd4f95e92fad303439f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= <lukasz.stolarczuk@intel.com>
Date: Thu, 21 Jul 2022 11:29:36 +0200
Subject: [PATCH 1/3] tests: add suppression for memcheck

ref. #1262
---
 tests/helpers.cmake | 4 ++--
 tests/memcheck.supp | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 tests/memcheck.supp

diff --git a/tests/helpers.cmake b/tests/helpers.cmake
index d38ec34799..8a1c103f5c 100644
--- a/tests/helpers.cmake
+++ b/tests/helpers.cmake
@@ -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})
 
@@ -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)
diff --git a/tests/memcheck.supp b/tests/memcheck.supp
new file mode 100644
index 0000000000..12f6ad9207
--- /dev/null
+++ b/tests/memcheck.supp
@@ -0,0 +1,7 @@
+{
+   <string cmp vectorization, libpmemobj-cpp #1262>
+   Memcheck:Addr32
+   fun:__wmemcmp_avx2_movbe
+   fun:compare
+   ...
+}

From f59db44d4a7cad005adaf77bb4a1949448258124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= <lukasz.stolarczuk@intel.com>
Date: Wed, 4 May 2022 09:54:46 +0200
Subject: [PATCH 2/3] CI: add step to configure msbuild on Windows

and use fixed Windows 2019
---
 .github/workflows/gha.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml
index 7800ff40a2..1cb848b780 100644
--- a/.github/workflows/gha.yml
+++ b/.github/workflows/gha.yml
@@ -109,7 +109,7 @@ jobs:
 
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     env:
       platform: x64
@@ -119,7 +119,6 @@ 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]
@@ -127,10 +126,11 @@ jobs:
         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/setup-msbuild@v1.1
+        with:
+          msbuild-architecture: ${env:ARCH}
 
       - name: Cache vcpkg packages
         uses: actions/cache@v1

From 7a78bb5c858785ac5566ba392b96754bbc0a2311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= <lukasz.stolarczuk@intel.com>
Date: Mon, 18 Jul 2022 13:29:19 +0200
Subject: [PATCH 3/3] docker: update pmdk installed version to 1.12.0

---
 utils/docker/images/install-pmdk.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/docker/images/install-pmdk.sh b/utils/docker/images/install-pmdk.sh
index 69a8590f63..5704aea8c9 100755
--- a/utils/docker/images/install-pmdk.sh
+++ b/utils/docker/images/install-pmdk.sh
@@ -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
@@ -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