diff --git a/src/test/libpmempool_api/out0.log.match b/src/test/libpmempool_api/out0.log.match
index d2561a339ab64f136d7a9f9676b8954b34460d93..c8deb190987cf91c0cb8f48c97e24fa37b443dbd 100644
--- a/src/test/libpmempool_api/out0.log.match
+++ b/src/test/libpmempool_api/out0.log.match
@@ -1,7 +1,8 @@
libpmempool_api$(nW)TEST0: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -d 1 -a 0 -r 1 $(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
diff --git a/src/test/libpmempool_api/out1.log.match b/src/test/libpmempool_api/out1.log.match
index 100b0c9d8f95b8c6e48e9c58476b1d4fff6e2890..2a70b5a036337272a00d94949bcbea14f160a5db 100644
--- a/src/test/libpmempool_api/out1.log.match
+++ b/src/test/libpmempool_api/out1.log.match
@@ -1,7 +1,8 @@
libpmempool_api$(nW)TEST1: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -d 0 -a 1 -r 1 $(*)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
diff --git a/src/test/libpmempool_api/out10.log.match b/src/test/libpmempool_api/out10.log.match
index 7fdeff216deb75fb55674bb1b652d24a4f7d0fda..6e76c1ce2fd6d5025cdfd09183e75845ff1d3c12 100644
--- a/src/test/libpmempool_api/out10.log.match
+++ b/src/test/libpmempool_api/out10.log.match
@@ -1,7 +1,8 @@
libpmempool_api$(nW)TEST10: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -d 0 -r 0 -y 0 $(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
status = not consistent
@@ -9,7 +10,8 @@ libpmempool_api$(nW)TEST10: DONE
libpmempool_api$(nW)TEST10: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -d 0 -r 1 -y 1 $(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
pool_hdr.major is not valid
diff --git a/src/test/libpmempool_api/out13.log.match b/src/test/libpmempool_api/out13.log.match
index cc449af264abb460d55cd5557a3704613bfd7ccd..5829456fdfa2dac5e1d09ab1df300d07a6c9ed21 100644
--- a/src/test/libpmempool_api/out13.log.match
+++ b/src/test/libpmempool_api/out13.log.match
@@ -5,7 +5,8 @@ libpmempool_api$(nW)TEST13: DONE
libpmempool_api$(nW)TEST13: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -s 999999 $(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
diff --git a/src/test/libpmempool_api/out9.log.match b/src/test/libpmempool_api/out9.log.match
index e5824c1470534bf1ed498cd832e77875728e7950..3590d89b826493b7fb9a258f41487f2b2b0101e8 100644
--- a/src/test/libpmempool_api/out9.log.match
+++ b/src/test/libpmempool_api/out9.log.match
@@ -2,7 +2,8 @@ Pool type: log Params: log
libpmempool_api$(nW)TEST9: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -d 1 -r 1 -y 1 -t log $(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
pool_hdr.major is not valid
@@ -15,7 +16,8 @@ Pool type: blk Params: blk 512
libpmempool_api$(nW)TEST9: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -d 1 -r 1 -y 1 -t blk $(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
pool_hdr.major is not valid
diff --git a/src/test/libpmempool_backup/out0.log.match b/src/test/libpmempool_backup/out0.log.match
index d918f4b77832a3fa4c1b7b4082b116e5dbbf56e6..8b7304afaf7881b301f77e3762d3a352166d2614 100644
--- a/src/test/libpmempool_backup/out0.log.match
+++ b/src/test/libpmempool_backup/out0.log.match
@@ -5,7 +5,8 @@ creating backup file: $(nW)pool.part2_backup
creating backup file: $(nW)pool.part3_backup
creating backup file: $(nW)pool.part4_backup
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -29,7 +30,8 @@ creating backup file: $(nW)pool.part2_backup
creating backup file: $(nW)pool.part3_backup
creating backup file: $(nW)pool.part4_backup
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -49,7 +51,8 @@ creating backup file: $(nW)pool.part2_backup
creating backup file: $(nW)pool.part3_backup
creating backup file: $(nW)pool.part4_backup
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/libpmempool_backup/out6.log.match b/src/test/libpmempool_backup/out6.log.match
index 05610fa1b6b58de0019b08ad854ebdc8545bc767..34102e991d3101fa2aff3cadf2ab0e94b49ba512 100644
--- a/src/test/libpmempool_backup/out6.log.match
+++ b/src/test/libpmempool_backup/out6.log.match
@@ -2,7 +2,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t blk -r 1 $(nW)pool.set
part files of the destination poolset of the backup already exist. Do you want to overwrite them?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -29,7 +30,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t blk -r 1 $(nW)pool.set
part files of the destination poolset of the backup already exist. Do you want to overwrite them?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -50,7 +52,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t log -r 1 $(nW)pool.set
part files of the destination poolset of the backup already exist. Do you want to overwrite them?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -73,7 +76,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t log -r 1 $(nW)pool.set
part files of the destination poolset of the backup already exist. Do you want to overwrite them?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -90,7 +94,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t obj -r 1 $(nW)pool.set
part files of the destination poolset of the backup already exist. Do you want to overwrite them?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -111,7 +116,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t obj -r 1 $(nW)pool.set
part files of the destination poolset of the backup already exist. Do you want to overwrite them?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/libpmempool_backup/out7.log.match b/src/test/libpmempool_backup/out7.log.match
index 51f16ea87ca03b62a91e6d0147e8096423dc383d..d59d40b997caa6f71f11089857b78dcb65398d19 100644
--- a/src/test/libpmempool_backup/out7.log.match
+++ b/src/test/libpmempool_backup/out7.log.match
@@ -2,7 +2,8 @@ libpmempool_backup/TEST7: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.blk_backup -t blk -r 1 $(nW)pool.blk
destination of the backup already exists. Do you want to overwrite it?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemblk header
@@ -22,7 +23,8 @@ libpmempool_backup/TEST7: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.log_backup -t log -r 1 $(nW)pool.log
destination of the backup already exists. Do you want to overwrite it?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
@@ -38,7 +40,8 @@ libpmempool_backup/TEST7: START: libpmempool_test$(nW)
$(nW)libpmempool_test$(nW) -b $(nW)pool.obj_backup -t obj -r 1 $(nW)pool.obj
destination of the backup already exists. Do you want to overwrite it?
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
status = consistent
diff --git a/src/test/pmempool_check/out1.log.match b/src/test/pmempool_check/out1.log.match
index 70a8708f78d5eadfc2feb1b65e58c9740f24cb12..154046c35161f0cbb47ce2f14825a0736eb932bb 100644
--- a/src/test/pmempool_check/out1.log.match
+++ b/src/test/pmempool_check/out1.log.match
@@ -8,7 +8,8 @@ $(nW): spoil: pool_hdr.shutdown_state.uuid=0
$(nW): spoil: pool_hdr.shutdown_state.f:checksum_gen
$(nW): spoil: pool_hdr.unused=$(*)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
pool_hdr.major is not valid
@@ -28,7 +29,8 @@ PMEMLOG: pmemlog
$(nW): spoil: pmemlog.start_offset=$(*)
$(nW): spoil: pmemlog.end_offset=$(*)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
diff --git a/src/test/pmempool_check/out10.log.match b/src/test/pmempool_check/out10.log.match
index 82019390ed912fa94e7cc35a43984450e2ee03a5..299c687e420ce26f2c949e0f7e50409bc951c1ed 100644
--- a/src/test/pmempool_check/out10.log.match
+++ b/src/test/pmempool_check/out10.log.match
@@ -1,8 +1,9 @@
$(nW)pool.replica2.part1: spoil: pool_hdr.uuid=ERROR
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_check/out13.log.match b/src/test/pmempool_check/out13.log.match
index d451d3ed685e70ee7c2a3c92fb7141c76b5c7140..d06f451f194441adf96baf582be6ba17641fd037 100644
--- a/src/test/pmempool_check/out13.log.match
+++ b/src/test/pmempool_check/out13.log.match
@@ -1,5 +1,6 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
pool_hdr.major is not valid
diff --git a/src/test/pmempool_check/out14.log.match b/src/test/pmempool_check/out14.log.match
index 7d7153455821fa9831b91720faa525bf6c5dea3c..3171e918105186fde83432b5f39b428c92823942 100644
--- a/src/test/pmempool_check/out14.log.match
+++ b/src/test/pmempool_check/out14.log.match
@@ -1,17 +1,20 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
pmemlog header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemblk header
diff --git a/src/test/pmempool_check/out15.log.match b/src/test/pmempool_check/out15.log.match
index 0dbfd0aacb30ba5739601b15b7cc7551385d00bd..62ab867b72678bcff548077aa4f7d7a7e62a1f23 100644
--- a/src/test/pmempool_check/out15.log.match
+++ b/src/test/pmempool_check/out15.log.match
@@ -2,7 +2,8 @@ Arguments: create log
Input: two parts per poolset
Output: four parts in poolset
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -14,7 +15,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -26,7 +28,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -41,7 +44,8 @@ Arguments: create blk 512
Input: two parts per poolset
Output: four parts in poolset
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -53,7 +57,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -65,7 +70,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -80,7 +86,8 @@ Arguments: create obj
Input: two parts per poolset
Output: four parts in poolset
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -92,7 +99,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -104,7 +112,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -117,9 +126,10 @@ the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
Output: two replicas with two parts each in poolset
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -131,9 +141,10 @@ replica 1 part 1: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -145,9 +156,10 @@ replica 1 part 1: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -160,13 +172,14 @@ the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
Output: four replicas in poolset
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
-replica 3: checking shutdown state
-replica 3: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
+$(OPT)replica 3: checking shutdown state
+$(OPT)replica 3: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
@@ -178,13 +191,14 @@ replica 3 part 0: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
-replica 3: checking shutdown state
-replica 3: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
+$(OPT)replica 3: checking shutdown state
+$(OPT)replica 3: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
@@ -196,13 +210,14 @@ replica 3 part 0: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
-replica 3: checking shutdown state
-replica 3: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
+$(OPT)replica 3: checking shutdown state
+$(OPT)replica 3: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
@@ -216,7 +231,8 @@ $(nW)pool.set: not consistent
Input: two replicas per poolset
Output: four parts in poolset
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -228,7 +244,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -240,7 +257,8 @@ replica 0 part 3: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -253,9 +271,10 @@ the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
Output: two replicas with two parts each in poolset
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -267,9 +286,10 @@ replica 1 part 1: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -281,9 +301,10 @@ replica 1 part 1: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -296,13 +317,14 @@ the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
Output: four replicas in poolset
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
-replica 3: checking shutdown state
-replica 3: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
+$(OPT)replica 3: checking shutdown state
+$(OPT)replica 3: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
@@ -314,13 +336,14 @@ replica 3 part 0: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
-replica 3: checking shutdown state
-replica 3: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
+$(OPT)replica 3: checking shutdown state
+$(OPT)replica 3: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
@@ -332,13 +355,14 @@ replica 3 part 0: pool header correct
the poolset contains part files from various poolsets
$(nW)pool.set: not consistent
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
-replica 3: checking shutdown state
-replica 3: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
+$(OPT)replica 3: checking shutdown state
+$(OPT)replica 3: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
diff --git a/src/test/pmempool_check/out16.log.match b/src/test/pmempool_check/out16.log.match
index 69ad39713c68ff380f24199f2171c014c8705e33..9ae7ea815b5d898ffd84a4e176aac65727d45e40 100644
--- a/src/test/pmempool_check/out16.log.match
+++ b/src/test/pmempool_check/out16.log.match
@@ -1,18 +1,21 @@
$(nW)pool.p1: spoil: pool_hdr.crtime=$(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag
replica 0 part 0: pool_hdr.crtime is not valid
$(nW)pool.set: cannot repair
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 0: pool_hdr.crtime is not valid
diff --git a/src/test/pmempool_check/out17.log.match b/src/test/pmempool_check/out17.log.match
index aec35d6c45d7c1b8e9445ad8270d318a6b51db74..5103f3ba66326dfb72de6d6a22a3678cd472746f 100644
--- a/src/test/pmempool_check/out17.log.match
+++ b/src/test/pmempool_check/out17.log.match
@@ -1,6 +1,7 @@
$(nW)pool.p1: spoil: pool_hdr.checksum=$(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 1: checking pool header
@@ -10,7 +11,8 @@ replica 0 part 0: invalid pool_hdr.checksum
$(nW)pool.set: cannot repair
$(nW)pool.p1: spoil: pool_hdr.uuid=$(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 1: checking pool header
@@ -21,7 +23,8 @@ replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED
replica 0 part 0: invalid pool_hdr.checksum
$(nW)pool.set: cannot repair
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_check/out18.log.match b/src/test/pmempool_check/out18.log.match
index 1cfa675e1290b3710060f12853006790462c4d11..0ac6f31875e305919f40bfc791298cbcfc8b7796 100644
--- a/src/test/pmempool_check/out18.log.match
+++ b/src/test/pmempool_check/out18.log.match
@@ -2,7 +2,8 @@ $(nW)pool.p1: spoil: pool_hdr.major=$(nW)
$(nW)pool.p1: spoil: pool_hdr.poolset_uuid=$(nW)
$(nW)pool.p1: spoil: pool_hdr.uuid=$(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 0: pool_hdr.major is not valid
diff --git a/src/test/pmempool_check/out19.log.match b/src/test/pmempool_check/out19.log.match
index fbd8e914c65e9107e4e445a05de6d896e718b836..43c7ca68e6274c3114ce5f9cff135a235a3bf558 100644
--- a/src/test/pmempool_check/out19.log.match
+++ b/src/test/pmempool_check/out19.log.match
@@ -1,11 +1,13 @@
$(nW)pool.p1: spoil: pool_hdr.arch_flags=$(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 0: pool_hdr.arch_flags is not valid
@@ -18,12 +20,14 @@ $(nW)pool.set: repaired
$(nW)pool.p1: spoil: pool_hdr.arch_flags=$(nW)
$(nW)pool.p2: spoil: pool_hdr.arch_flags=$(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 1: checking pool header
@@ -32,7 +36,8 @@ replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED
replica 0 part 0: invalid pool_hdr.checksum
$(nW)pool.set: cannot repair
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_check/out20.log.match b/src/test/pmempool_check/out20.log.match
index f8fd6192a14aead06b362bd0fe18f9b21bb5459c..6adb515d9220b89942a578cae69376e32088dc61 100644
--- a/src/test/pmempool_check/out20.log.match
+++ b/src/test/pmempool_check/out20.log.match
@@ -6,7 +6,8 @@ $(nW)file.pool: cannot repair
$(nW)file.pool: spoil: pool_hdr.features.compat=0x00
$(nW)file.pool: spoil: pool_hdr.f:checksum_gen
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
@@ -20,7 +21,8 @@ $(nW)file.pool: cannot repair
$(nW)file.pool: spoil: pool_hdr.features.compat=0x00
$(nW)file.pool: spoil: pool_hdr.f:checksum_gen
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemblk header
@@ -38,7 +40,8 @@ $(nW)file.pool: cannot repair
$(nW)file.pool: spoil: pool_hdr.features.compat=0x00
$(nW)file.pool: spoil: pool_hdr.f:checksum_gen
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
$(nW)file.pool: consistent
diff --git a/src/test/pmempool_check/out22.log.match b/src/test/pmempool_check/out22.log.match
index d451d3ed685e70ee7c2a3c92fb7141c76b5c7140..d06f451f194441adf96baf582be6ba17641fd037 100644
--- a/src/test/pmempool_check/out22.log.match
+++ b/src/test/pmempool_check/out22.log.match
@@ -1,5 +1,6 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
pool_hdr.major is not valid
diff --git a/src/test/pmempool_check/out23.log.match b/src/test/pmempool_check/out23.log.match
index 7d7153455821fa9831b91720faa525bf6c5dea3c..3171e918105186fde83432b5f39b428c92823942 100644
--- a/src/test/pmempool_check/out23.log.match
+++ b/src/test/pmempool_check/out23.log.match
@@ -1,17 +1,20 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemlog header
pmemlog header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemblk header
diff --git a/src/test/pmempool_check/out25.log.match b/src/test/pmempool_check/out25.log.match
index 90e9d57ca67d7dedbdaacd8449a147485bf4c27a..66fcfceb0639d24a4a030ade21ad07ffb6dfade4 100644
--- a/src/test/pmempool_check/out25.log.match
+++ b/src/test/pmempool_check/out25.log.match
@@ -1,12 +1,14 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
replica 0 part 1: pool header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -15,7 +17,8 @@ checking pmemlog header
pmemlog header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_check/out27.log.match b/src/test/pmempool_check/out27.log.match
index 9fe38c512eda97fece21a1f217db812039f39081..2ccbb2239041a4faefd385ef8680a4e7fe9aa749 100644
--- a/src/test/pmempool_check/out27.log.match
+++ b/src/test/pmempool_check/out27.log.match
@@ -1,17 +1,20 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
checking pmemlog header
pmemlog header correct
$(nW) consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
checking pmemblk header
diff --git a/src/test/pmempool_check/out4.log.match b/src/test/pmempool_check/out4.log.match
index 841153b7750f067360886002918d70f92ffa8397..03a317dc801c479a65f86b6066b2fc272f5802d8 100644
--- a/src/test/pmempool_check/out4.log.match
+++ b/src/test/pmempool_check/out4.log.match
@@ -1,13 +1,15 @@
$(nW): spoil: pool_hdr.checksum=$(nW)
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag
invalid pool_hdr.checksum
$(nW)file.pool: cannot repair
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
invalid pool_hdr.checksum
diff --git a/src/test/pmempool_check/out5.log.match b/src/test/pmempool_check/out5.log.match
index 53848539c53bc9874825ad066a57bbe3213571c5..98a94eaf4a52935a7d2b773a4da247b3f3bb8d76 100644
--- a/src/test/pmempool_check/out5.log.match
+++ b/src/test/pmempool_check/out5.log.match
@@ -1,12 +1,14 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag
invalid pool_hdr.checksum
$(nW)file.pool: cannot repair
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
invalid pool_hdr.checksum
diff --git a/src/test/pmempool_check/out7.log.match b/src/test/pmempool_check/out7.log.match
index ff51dde780070f5e9f1a4ebb2d5c466cb83059ba..673f17ca8db79a5d3a4eda312f9a86aee033a17c 100644
--- a/src/test/pmempool_check/out7.log.match
+++ b/src/test/pmempool_check/out7.log.match
@@ -2,7 +2,8 @@ $(nW)file.pool: spoil: pool_hdr.uuid=ERROR
incorrect pool header
$(nW)file.pool: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
invalid pool_hdr.uuid
@@ -13,7 +14,8 @@ checking BTT Info headers
BTT Layout not written
$(nW)file.pool: repaired
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemblk header
@@ -26,14 +28,16 @@ $(nW)file.pool: spoil: pool_hdr.next_part_uuid=ERROR_NEXT
incorrect pool header
$(nW)file.pool: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag
invalid pool_hdr.uuid
$(nW)file.pool: cannot repair
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
invalid pool_hdr.uuid
@@ -54,7 +58,8 @@ checking BTT Info headers
BTT Layout not written
$(nW)file.pool: repaired
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemblk header
@@ -69,14 +74,16 @@ $(nW)file.pool: spoil: pool_hdr.next_repl_uuid=ERROR_RNEXT
incorrect pool header
$(nW)file.pool: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag
invalid pool_hdr.uuid
$(nW)file.pool: cannot repair
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
invalid pool_hdr.uuid
@@ -97,7 +104,8 @@ checking BTT Info headers
BTT Layout not written
$(nW)file.pool: repaired
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
checking pmemblk header
diff --git a/src/test/pmempool_check/out8.log.match b/src/test/pmempool_check/out8.log.match
index 3184d01d28e6ae5107b5bd614e8ed9e8614da02c..3ee0d73140089bc12b9195691dc9d9d85198e879 100644
--- a/src/test/pmempool_check/out8.log.match
+++ b/src/test/pmempool_check/out8.log.match
@@ -6,7 +6,8 @@ $(nW)pool.p1: spoil: pool_hdr.poolset_uuid=ERROR
replica 0 part 0: incorrect pool header
$(nW)pool.set: not consistent
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
replica 0 part 0: checking pool header
replica 0 part 0: incorrect pool header
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_check/out9.log.match b/src/test/pmempool_check/out9.log.match
index d180c92cf5aacd296c8c7e814f357d9ed4f744b6..be170dbb52520ab159811c156b61afee20f830c5 100644
--- a/src/test/pmempool_check/out9.log.match
+++ b/src/test/pmempool_check/out9.log.match
@@ -1,5 +1,6 @@
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
pool header correct
$(nW)file.pool: consistent
@@ -13,7 +14,8 @@ $(nW): spoil: pool_hdr.shutdown_state.uuid=0
$(nW): spoil: pool_hdr.shutdown_state.f:checksum_gen
$(nW)file.pool: spoil: pool_hdr.unused=ERROR
checking shutdown state
-shutdown state correct
+$(OPT)shutdown state correct
+$(OPX)shutdown state not supported
checking pool header
incorrect pool header
the repair of pmemobj pools is not supported
diff --git a/src/test/pmempool_sync/out27.log.match b/src/test/pmempool_sync/out27.log.match
index fcf7fa64af1cc2cd851bd38500a66ccf80d761b2..92889289b3f28e7576572966e4720e403cc2f3fc 100644
--- a/src/test/pmempool_sync/out27.log.match
+++ b/src/test/pmempool_sync/out27.log.match
@@ -9,9 +9,10 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
"length":16,
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out28.log.match b/src/test/pmempool_sync/out28.log.match
index 40196c45415e710a69750b74c1b6ab1290838a15..d169a0c8907b62ba07aee07b5041a64f87ff1285 100644
--- a/src/test/pmempool_sync/out28.log.match
+++ b/src/test/pmempool_sync/out28.log.match
@@ -10,9 +10,10 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)/testset1: synchronized
No bad blocks found
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
diff --git a/src/test/pmempool_sync/out29.log.match b/src/test/pmempool_sync/out29.log.match
index beaeacfe48a189c242e3fdc20d10c37abea2fc2f..77f0c1420aa8d4c2b671acd4a9ef0902d2645048 100644
--- a/src/test/pmempool_sync/out29.log.match
+++ b/src/test/pmempool_sync/out29.log.match
@@ -2,9 +2,10 @@ create($(nW)/testset1): allocating records in the pool ...
create($(nW)/testset1): allocated $(N) records (of size $(N))
verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(N))
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
@@ -12,9 +13,10 @@ replica 0 part 1: empty pool hdr
$(nW)/testset1: not consistent
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out30.log.match b/src/test/pmempool_sync/out30.log.match
index cf8e313bf8ae8d759993236140b69140248474a8..a795dd78cd63f1402377b9f768f2016bb88f8d2b 100644
--- a/src/test/pmempool_sync/out30.log.match
+++ b/src/test/pmempool_sync/out30.log.match
@@ -64,9 +64,10 @@ Root offset : $(nW)
"length":8,
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out31.log.match b/src/test/pmempool_sync/out31.log.match
index a930f6272e73de6fa3b446d9b066b6a9e0a5de88..dbe3e2839f199a31288187e615404663e421f258 100644
--- a/src/test/pmempool_sync/out31.log.match
+++ b/src/test/pmempool_sync/out31.log.match
@@ -58,9 +58,10 @@ Root offset : $(nW)
$(nW)/testset1: synchronized
No bad blocks found
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 1 part 0: checking pool header
diff --git a/src/test/pmempool_sync/out38.log.match b/src/test/pmempool_sync/out38.log.match
index f0ed872d3aab66266ca35885230d66ea64a68c54..1ec8253b9ea7a558448736b447c0321a44430978 100644
--- a/src/test/pmempool_sync/out38.log.match
+++ b/src/test/pmempool_sync/out38.log.match
@@ -65,9 +65,10 @@ Root offset : $(nW)
$(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out39.log.match b/src/test/pmempool_sync/out39.log.match
index 7438695b928f353015ba1d8fb522e3e951fb0e13..a2152758f351cbd058036ef171833bbc28d265ae 100644
--- a/src/test/pmempool_sync/out39.log.match
+++ b/src/test/pmempool_sync/out39.log.match
@@ -65,9 +65,10 @@ Root offset : $(nW)
$(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out40.log.match b/src/test/pmempool_sync/out40.log.match
index da9b663d0e7cb638584f18728bf4ada5f2aa7bd4..11a231ae248e10d352c6f94f27c5cbfc6419e4ea 100644
--- a/src/test/pmempool_sync/out40.log.match
+++ b/src/test/pmempool_sync/out40.log.match
@@ -65,9 +65,10 @@ Root offset : $(nW)
$(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out41.log.match b/src/test/pmempool_sync/out41.log.match
index 7438695b928f353015ba1d8fb522e3e951fb0e13..a2152758f351cbd058036ef171833bbc28d265ae 100644
--- a/src/test/pmempool_sync/out41.log.match
+++ b/src/test/pmempool_sync/out41.log.match
@@ -65,9 +65,10 @@ Root offset : $(nW)
$(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out42.log.match b/src/test/pmempool_sync/out42.log.match
index 6887b88d6e79399bc13d2dc264a23f01f1ad20e4..3acf449bda5737bf0eb8fdcb42e99af56bc3ce32 100644
--- a/src/test/pmempool_sync/out42.log.match
+++ b/src/test/pmempool_sync/out42.log.match
@@ -6,9 +6,10 @@ verify($(nW)/testset1): incorrect number of records (is: $(N), should be: $(N))
verify($(nW)/testset1): pool file contains error
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out44.log.match b/src/test/pmempool_sync/out44.log.match
index 48d3b9a1c2925c22b2276ec7067dfafde37ee827..e0266c7162e47d0a634eddfbd63e6f4bdbc65f11 100644
--- a/src/test/pmempool_sync/out44.log.match
+++ b/src/test/pmempool_sync/out44.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out45.log.match b/src/test/pmempool_sync/out45.log.match
index 48d3b9a1c2925c22b2276ec7067dfafde37ee827..e0266c7162e47d0a634eddfbd63e6f4bdbc65f11 100644
--- a/src/test/pmempool_sync/out45.log.match
+++ b/src/test/pmempool_sync/out45.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out46.log.match b/src/test/pmempool_sync/out46.log.match
index 48d3b9a1c2925c22b2276ec7067dfafde37ee827..e0266c7162e47d0a634eddfbd63e6f4bdbc65f11 100644
--- a/src/test/pmempool_sync/out46.log.match
+++ b/src/test/pmempool_sync/out46.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out47.log.match b/src/test/pmempool_sync/out47.log.match
index d74b615aa96f4a70cfa5fe030d0a8e4ad06a68cc..a3feea8552d99ace67fc183512e1cef2c1d70608 100644
--- a/src/test/pmempool_sync/out47.log.match
+++ b/src/test/pmempool_sync/out47.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out48.log.match b/src/test/pmempool_sync/out48.log.match
index d74b615aa96f4a70cfa5fe030d0a8e4ad06a68cc..a3feea8552d99ace67fc183512e1cef2c1d70608 100644
--- a/src/test/pmempool_sync/out48.log.match
+++ b/src/test/pmempool_sync/out48.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out49.log.match b/src/test/pmempool_sync/out49.log.match
index d74b615aa96f4a70cfa5fe030d0a8e4ad06a68cc..a3feea8552d99ace67fc183512e1cef2c1d70608 100644
--- a/src/test/pmempool_sync/out49.log.match
+++ b/src/test/pmempool_sync/out49.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out50.log.match b/src/test/pmempool_sync/out50.log.match
index d74b615aa96f4a70cfa5fe030d0a8e4ad06a68cc..a3feea8552d99ace67fc183512e1cef2c1d70608 100644
--- a/src/test/pmempool_sync/out50.log.match
+++ b/src/test/pmempool_sync/out50.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out51.log.match b/src/test/pmempool_sync/out51.log.match
index d74b615aa96f4a70cfa5fe030d0a8e4ad06a68cc..a3feea8552d99ace67fc183512e1cef2c1d70608 100644
--- a/src/test/pmempool_sync/out51.log.match
+++ b/src/test/pmempool_sync/out51.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out52.log.match b/src/test/pmempool_sync/out52.log.match
index d74b615aa96f4a70cfa5fe030d0a8e4ad06a68cc..a3feea8552d99ace67fc183512e1cef2c1d70608 100644
--- a/src/test/pmempool_sync/out52.log.match
+++ b/src/test/pmempool_sync/out52.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header
diff --git a/src/test/pmempool_sync/out53.log.match b/src/test/pmempool_sync/out53.log.match
index d74b615aa96f4a70cfa5fe030d0a8e4ad06a68cc..a3feea8552d99ace67fc183512e1cef2c1d70608 100644
--- a/src/test/pmempool_sync/out53.log.match
+++ b/src/test/pmempool_sync/out53.log.match
@@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(
$(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument
$(nW)/testset1: synchronized
replica 0: checking shutdown state
-replica 0: shutdown state correct
-replica 1: checking shutdown state
-replica 1: shutdown state correct
-replica 2: checking shutdown state
-replica 2: shutdown state correct
+$(OPT)replica 0: shutdown state correct
+$(OPX)replica 0: shutdown state not supported
+$(OPT)replica 1: checking shutdown state
+$(OPT)replica 1: shutdown state correct
+$(OPT)replica 2: checking shutdown state
+$(OPT)replica 2: shutdown state correct
replica 0 part 0: checking pool header
replica 0 part 0: pool header correct
replica 0 part 1: checking pool header