This is an autogenerated patch header for a single-debian-patch file. The
delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.

--- pmdk-1.9.1.orig/src/test/drd-log.supp
+++ pmdk-1.9.1/src/test/drd-log.supp
@@ -1,7 +1,7 @@
 {
     <debug_log_suppress>
     drd:ConflictingAccess
-    fun:*mempcpy
+    fun:*mem*cpy
     ...
     fun:_IO_file_xsputn@@GLIBC*
     fun:fputs
@@ -22,7 +22,7 @@
 {
     <ut_log_suppress>
     drd:ConflictingAccess
-    fun:*mempcpy
+    fun:*mem*cpy
     fun:_IO_file_xsputn@@GLIBC*
     fun:fputs
     ...
--- pmdk-1.9.1.orig/src/test/helgrind-log.supp
+++ pmdk-1.9.1/src/test/helgrind-log.supp
@@ -1,7 +1,7 @@
 {
     <debug_log_suppress>
     Helgrind:Race
-    fun:*mempcpy
+    fun:*mem*cpy
     ...
     fun:_IO_file_xsputn@@GLIBC*
     fun:fputs
@@ -20,9 +20,21 @@
     fun:out_log
 }
 {
+    <debug_err_suppress>
+    Helgrind:Race
+    fun:*mem*cpy
+    ...
+    fun:_IO_file_xsputn@@GLIBC*
+    fun:fputs
+    fun:out_print_func
+    fun:out_error
+    fun:out_err
+}
+
+{
     <ut_log_suppress>
     Helgrind:Race
-    fun:*mempcpy
+    fun:*mem*cpy
     fun:_IO_file_xsputn@@GLIBC*
     fun:fputs
     ...
--- pmdk-1.9.1.orig/src/test/obj_persist_count/out3.log.match
+++ pmdk-1.9.1/src/test/obj_persist_count/out3.log.match
@@ -3,7 +3,7 @@ obj_persist_count$(nW)TEST3: START: obj_
 task           cl(all) drain(all) pmem_persist pmem_msync pmem_flush pmem_drain pmem_memcpy_cls pmem_memcpy_drain pmem_memset_cls pmem_memset_drain potential_cache_misses 
 $(OPT)pool_create    55362   24         11           5          0          5          0               0                 11              3                 55355                  
 $(OPX)pool_create    50242   14         11           0          0          0          0               0                 11              3                 50235                  
-root_alloc     13      4          0            0          3          1          8               2                 2               1                 5                      
+root_alloc     13      5          0            0          3          2          8               2                 2               1                 5                      
 atomic_alloc   3       2          1            0          0          1          2               0                 0               0                 1                      
 atomic_free    1       2          1            0          0          1          0               0                 0               0                 1                      
 tx_begin_end   0       2          0            0          0          2          0               0                 0               0                 0                      
@@ -13,10 +13,10 @@ tx_free        1       1          1
 tx_free_next   1       1          1            0          0          0          0               0                 0               0                 1                      
 tx_add         5       3          1            0          0          1          2               0                 2               1                 1                      
 tx_add_next    5       3          1            0          0          1          2               0                 2               1                 1                      
-tx_add_large   189     13         6            0          4          3          170             2                 6               2                 13                     
+tx_add_large   189     14         6            0          4          4          170             2                 6               2                 13                     
 tx_add_lnext   167     5          1            0          0          2          162             0                 4               2                 1                      
-pmalloc        10      3          0            0          2          1          8               2                 0               0                 2                      
-pfree          8       3          0            0          2          1          6               2                 0               0                 2                      
+pmalloc        10      4          0            0          2          2          8               2                 0               0                 2                      
+pfree          8       4          0            0          2          2          6               2                 0               0                 2                      
 pmalloc_stack  3       2          1            0          0          1          2               0                 0               0                 1                      
 pfree_stack    1       2          1            0          0          1          0               0                 0               0                 1                      
 obj_persist_count$(nW)TEST3: DONE
--- pmdk-1.9.1.orig/src/test/pmempool_feature/common.sh
+++ pmdk-1.9.1/src/test/pmempool_feature/common.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018-2019, Intel Corporation
+# Copyright 2018-2020, Intel Corporation
 
 #
 # src/test/pmempool_feature/common.sh -- common part of pmempool_feature tests
@@ -26,7 +26,7 @@ sds_enabled=$(is_ndctl_enabled $pmempool
 #
 # usage: pmempool_feature_query_return <feature>
 function pmempool_feature_query_return() {
-       return $($pmempool_exe feature -q $1 $POOLSET 2>> $LOG)
+       echo $($pmempool_exe feature -q $1 $POOLSET 2>> $LOG)
 }
 
 # pmempool_feature_query -- query feature
@@ -132,8 +132,8 @@ function pmempool_feature_test_CKSUM_2K(
 
 	# If SDS is not enabled at this point is because SDS is not available for
 	# this device
-	pmempool_feature_query_return "SHUTDOWN_STATE"
-	if [[ $? -eq 0 ]]; then
+	ret=$(pmempool_feature_query_return "SHUTDOWN_STATE")
+	if [[ $ret -eq 0 ]]; then
 		msg "$UNITTEST_NAME: SKIP: SDS is not available"
 		exit 0
 	fi
