diff --git a/src/test/pmempool_check/TEST1 b/src/test/pmempool_check/TEST1 index 82239ccfe9d9e78e07052ca35e9346178108005a..92bfe43995a01efcefdd9995fa005f00ce78d33c 100755 --- a/src/test/pmempool_check/TEST1 +++ b/src/test/pmempool_check/TEST1 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -53,6 +53,9 @@ $PMEMSPOIL -v $POOL pool_hdr.major=0x0\ pool_hdr.features.compat=0xfe\ pool_hdr.features.incompat=0xfb\ pool_hdr.features.ro_compat=0xff\ + pool_hdr.shutdown_state.usc=0\ + pool_hdr.shutdown_state.uuid=0\ + 'pool_hdr.shutdown_state.checksum_gen()'\ pool_hdr.unused=ERROR >> $LOG expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG diff --git a/src/test/pmempool_check/TEST1.PS1 b/src/test/pmempool_check/TEST1.PS1 index 30c187165c5e049c7c9efc39c9f361ba33fada28..ef54d4817e00c03c2b688a3db027861923c6d914 100644 --- a/src/test/pmempool_check/TEST1.PS1 +++ b/src/test/pmempool_check/TEST1.PS1 @@ -1,5 +1,5 @@ # -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,11 +47,8 @@ $LOG="out$Env:UNITTEST_NUM.log" echo "PMEMLOG: pool_hdr" > $LOG expect_normal_exit $PMEMPOOL create log $POOL check_file $POOL -# pool_hdr.features.incompat on Windows has to have SHUTDOWN_STATE feature enabled -# otherwise pmempool check will fail because of dirty shutdown state structures -# which are expected to be zeroed if SHUTDOWN_STATE feature is disabled -# 0xfe == 0xfb | SHUTDOWN_STATE -Invoke-Expression "$PMEMSPOIL -v $POOL pool_hdr.major=0x0 pool_hdr.features.compat=0xfe pool_hdr.features.incompat=0xfe pool_hdr.features.ro_compat=0xff pool_hdr.unused=ERROR >> $LOG" + +Invoke-Expression "$PMEMSPOIL -v $POOL pool_hdr.major=0x0 pool_hdr.features.compat=0xfe pool_hdr.features.incompat=0xfe pool_hdr.features.ro_compat=0xfb pool_hdr.shutdown_state.usc=0 pool_hdr.shutdown_state.uuid=0 'pool_hdr.shutdown_state.checksum_gen()' pool_hdr.unused=ERROR >> $LOG" expect_normal_exit $PMEMPOOL check -vry $POOL >> $LOG echo "PMEMLOG: pmemlog" >> $LOG diff --git a/src/test/pmempool_check/TEST9 b/src/test/pmempool_check/TEST9 index bf90d9cb6104a2e64abf0744f0e64ef9586c1488..6f006dd282a35aaff82fe61d1ff9294a135c1b72 100755 --- a/src/test/pmempool_check/TEST9 +++ b/src/test/pmempool_check/TEST9 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -54,6 +54,9 @@ $PMEMSPOIL -v $POOL pool_hdr.major=0x0\ pool_hdr.features.compat=0xfe\ pool_hdr.features.incompat=0xfb\ pool_hdr.features.ro_compat=0xff\ + pool_hdr.shutdown_state.usc=0\ + pool_hdr.shutdown_state.uuid=0\ + 'pool_hdr.shutdown_state.checksum_gen()'\ pool_hdr.unused=ERROR >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vyr $POOL >> $LOG diff --git a/src/test/pmempool_check/TEST9.PS1 b/src/test/pmempool_check/TEST9.PS1 index 5cb0943714dcefda369ee94743828afb2708da5e..cc0ab95f57ff8dd61e51d3f71c0c823b6cd68431 100644 --- a/src/test/pmempool_check/TEST9.PS1 +++ b/src/test/pmempool_check/TEST9.PS1 @@ -1,5 +1,5 @@ # -# Copyright 2017-2018, Intel Corporation +# Copyright 2017-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -48,15 +48,14 @@ expect_normal_exit $PMEMPOOL create obj $POOL expect_normal_exit $PMEMPOOL check -vyr $POOL >> $LOG -# pool_hdr.features.incompat on Windows has to have SHUTDOWN_STATE feature enabled -# otherwise pmempool check will fail because of dirty shutdown state structures -# which are expected to be zeroed if SHUTDOWN_STATE feature is disabled -# 0xfe == 0xfb | SHUTDOWN_STATE &$PMEMSPOIL -v $POOL ` pool_hdr.major=0x0 ` pool_hdr.features.compat=0xfe ` pool_hdr.features.incompat=0xfe ` pool_hdr.features.ro_compat=0xff ` + pool_hdr.shutdown_state.usc=0 ` + pool_hdr.shutdown_state.uuid=0 ` + 'pool_hdr.shutdown_state.checksum_gen()' ` pool_hdr.unused=ERROR ` >> $LOG diff --git a/src/test/pmempool_check/out1.log.match b/src/test/pmempool_check/out1.log.match index 301bc9f4db45bb7ba756f12966f3ea9e78c366b9..6515de7c56bfd16c24aa962cb8fb896a0cc5dacc 100644 --- a/src/test/pmempool_check/out1.log.match +++ b/src/test/pmempool_check/out1.log.match @@ -3,6 +3,9 @@ $(nW): spoil: pool_hdr.major=$(*) $(nW): spoil: pool_hdr.features.compat=$(*) $(nW): spoil: pool_hdr.features.incompat=$(*) $(nW): spoil: pool_hdr.features.ro_compat=$(*) +$(nW): spoil: pool_hdr.shutdown_state.usc=0 +$(nW): spoil: pool_hdr.shutdown_state.uuid=0 +$(nW): spoil: pool_hdr.shutdown_state.checksum_gen() $(nW): spoil: pool_hdr.unused=$(*) checking shutdown state shutdown state correct diff --git a/src/test/pmempool_check/out9.log.match b/src/test/pmempool_check/out9.log.match index 46149f1c2bb55626dbec021d2aa1c492ae977f0d..057e73a55d55f6dffc1972f1f04bffc77d454974 100644 --- a/src/test/pmempool_check/out9.log.match +++ b/src/test/pmempool_check/out9.log.match @@ -8,6 +8,9 @@ $(nW)file.pool: spoil: pool_hdr.features.compat=0xfe $(OPT)$(nW)file.pool: spoil: pool_hdr.features.incompat=0xfb $(OPX)$(nW)file.pool: spoil: pool_hdr.features.incompat=0xfe $(nW)file.pool: spoil: pool_hdr.features.ro_compat=0xff +$(nW): spoil: pool_hdr.shutdown_state.usc=0 +$(nW): spoil: pool_hdr.shutdown_state.uuid=0 +$(nW): spoil: pool_hdr.shutdown_state.checksum_gen() $(nW)file.pool: spoil: pool_hdr.unused=ERROR checking shutdown state shutdown state correct