From 2e40ceb65d7d24996a29e3565762fa474d7d18a6 Mon Sep 17 00:00:00 2001 From: Lukasz Dorau <lukasz.dorau@intel.com> Date: Thu, 26 Sep 2019 15:45:14 +0200 Subject: [PATCH] test: do not check value of DAX device alignment --- src/test/pmempool_info/out24.log.match | 2 +- src/test/pmempool_sync/out28.log.match | 2 +- src/test/pmempool_sync/out31.log.match | 4 ++-- src/test/pmempool_transform/out18.log.match | 4 ++-- src/test/pmempool_transform_remote/node_0_out11.log.match | 2 +- src/test/pmempool_transform_remote/node_0_out6.log.match | 2 +- src/test/pmempool_transform_remote/node_0_out7.log.match | 2 +- src/test/pmempool_transform_remote/node_1_out13.log.match | 6 +++--- src/test/pmempool_transform_remote/node_1_out15.log.match | 6 +++--- src/test/pmempool_transform_remote/node_1_out19.log.match | 6 +++--- src/test/pmempool_transform_remote/node_1_out6.log.match | 6 +++--- src/test/pmempool_transform_remote/node_1_out8.log.match | 6 +++--- src/test/pmempool_transform_remote/node_1_out9.log.match | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/test/pmempool_info/out24.log.match b/src/test/pmempool_info/out24.log.match index 8e10260c2..0030541f7 100644 --- a/src/test/pmempool_info/out24.log.match +++ b/src/test/pmempool_info/out24.log.match @@ -8,7 +8,7 @@ part 0: path : /dev/dax$(N).$(N) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) bad blocks: offset length 16 8 diff --git a/src/test/pmempool_sync/out28.log.match b/src/test/pmempool_sync/out28.log.match index ca05e5d06..e06d85dfd 100644 --- a/src/test/pmempool_sync/out28.log.match +++ b/src/test/pmempool_sync/out28.log.match @@ -26,7 +26,7 @@ part 0: path : /dev/dax$(N).$(N) type : device dax size : $(N) -alignment : 4096 +alignment : $(N) Replica 1 - local, 1 part(s): part 0: path : $(nW)/testfile1 diff --git a/src/test/pmempool_sync/out31.log.match b/src/test/pmempool_sync/out31.log.match index 9306d9594..a930f6272 100644 --- a/src/test/pmempool_sync/out31.log.match +++ b/src/test/pmempool_sync/out31.log.match @@ -11,7 +11,7 @@ part 0: path : /dev/dax$(N).$(N) type : device dax size : $(N) -alignment : 4096 +alignment : $(N) bad blocks: offset length 1000 8 @@ -74,7 +74,7 @@ part 0: path : /dev/dax$(N).$(N) type : device dax size : $(N) -alignment : 4096 +alignment : $(N) Replica 1 - local, 1 part(s): part 0: path : $(nW)/testfile1 diff --git a/src/test/pmempool_transform/out18.log.match b/src/test/pmempool_transform/out18.log.match index 8fc845fc3..4b5fa80a8 100644 --- a/src/test/pmempool_transform/out18.log.match +++ b/src/test/pmempool_transform/out18.log.match @@ -29,12 +29,12 @@ part 0: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) part 1: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) Replica 1 - local, 2 part(s): part 0: path : $(nW)part00 diff --git a/src/test/pmempool_transform_remote/node_0_out11.log.match b/src/test/pmempool_transform_remote/node_0_out11.log.match index 6a26682bf..bfd51b85c 100644 --- a/src/test/pmempool_transform_remote/node_0_out11.log.match +++ b/src/test/pmempool_transform_remote/node_0_out11.log.match @@ -2,7 +2,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ [part file] diff --git a/src/test/pmempool_transform_remote/node_0_out6.log.match b/src/test/pmempool_transform_remote/node_0_out6.log.match index 6a26682bf..bfd51b85c 100644 --- a/src/test/pmempool_transform_remote/node_0_out6.log.match +++ b/src/test/pmempool_transform_remote/node_0_out6.log.match @@ -2,7 +2,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ [part file] diff --git a/src/test/pmempool_transform_remote/node_0_out7.log.match b/src/test/pmempool_transform_remote/node_0_out7.log.match index 6a26682bf..bfd51b85c 100644 --- a/src/test/pmempool_transform_remote/node_0_out7.log.match +++ b/src/test/pmempool_transform_remote/node_0_out7.log.match @@ -2,7 +2,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ [part file] diff --git a/src/test/pmempool_transform_remote/node_1_out13.log.match b/src/test/pmempool_transform_remote/node_1_out13.log.match index b8cd08e3a..00dc688da 100644 --- a/src/test/pmempool_transform_remote/node_1_out13.log.match +++ b/src/test/pmempool_transform_remote/node_1_out13.log.match @@ -5,12 +5,12 @@ part 0: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) part 1: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) Replica 1 - remote: node : $(nW) pool set : poolset.remote @@ -45,7 +45,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ [part file] diff --git a/src/test/pmempool_transform_remote/node_1_out15.log.match b/src/test/pmempool_transform_remote/node_1_out15.log.match index c0d86e354..0290e5c6f 100644 --- a/src/test/pmempool_transform_remote/node_1_out15.log.match +++ b/src/test/pmempool_transform_remote/node_1_out15.log.match @@ -5,12 +5,12 @@ part 0: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) part 1: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) Poolset options: SINGLEHDR @@ -42,7 +42,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ diff --git a/src/test/pmempool_transform_remote/node_1_out19.log.match b/src/test/pmempool_transform_remote/node_1_out19.log.match index c0d86e354..0290e5c6f 100644 --- a/src/test/pmempool_transform_remote/node_1_out19.log.match +++ b/src/test/pmempool_transform_remote/node_1_out19.log.match @@ -5,12 +5,12 @@ part 0: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) part 1: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) Poolset options: SINGLEHDR @@ -42,7 +42,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ diff --git a/src/test/pmempool_transform_remote/node_1_out6.log.match b/src/test/pmempool_transform_remote/node_1_out6.log.match index b8cd08e3a..00dc688da 100644 --- a/src/test/pmempool_transform_remote/node_1_out6.log.match +++ b/src/test/pmempool_transform_remote/node_1_out6.log.match @@ -5,12 +5,12 @@ part 0: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) part 1: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) Replica 1 - remote: node : $(nW) pool set : poolset.remote @@ -45,7 +45,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ [part file] diff --git a/src/test/pmempool_transform_remote/node_1_out8.log.match b/src/test/pmempool_transform_remote/node_1_out8.log.match index b8cd08e3a..00dc688da 100644 --- a/src/test/pmempool_transform_remote/node_1_out8.log.match +++ b/src/test/pmempool_transform_remote/node_1_out8.log.match @@ -5,12 +5,12 @@ part 0: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) part 1: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) Replica 1 - remote: node : $(nW) pool set : poolset.remote @@ -45,7 +45,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ [part file] diff --git a/src/test/pmempool_transform_remote/node_1_out9.log.match b/src/test/pmempool_transform_remote/node_1_out9.log.match index 30fcba6f5..aff27d34c 100644 --- a/src/test/pmempool_transform_remote/node_1_out9.log.match +++ b/src/test/pmempool_transform_remote/node_1_out9.log.match @@ -5,7 +5,7 @@ part 0: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) part 1: path : $(nW) type : device dax @@ -45,7 +45,7 @@ Part file: path : $(nW) type : device dax size : $(nW) -alignment : 4096 +alignment : $(N) POOL Header: Signature : PMEMOBJ [part file] -- GitLab