Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: avoid unnecessary skip in case of different expected test type #5799

Merged
merged 1 commit into from
Jul 14, 2023
Merged

test: avoid unnecessary skip in case of different expected test type #5799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/test/libpmempool_backup/TEST6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@

. ../unittest/unittest.sh

EXE=../libpmempool_api/libpmempool_test$EXESUFFIX
require_test_type medium

# This test memcpy + persist entire pool, and it runs
# forever under pmemcheck.
EXE=../libpmempool_api/libpmempool_test$EXESUFFIX
configure_valgrind pmemcheck force-disable $EXE

require_test_type medium

require_fs_type pmem non-pmem

setup
Expand Down
6 changes: 3 additions & 3 deletions src/test/obj_many_size_allocs/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2015-2019, Intel Corporation
# Copyright 2015-2023, Intel Corporation
#
# Copyright (c) 2016, Microsoft Corporation. All rights reserved.
#
Expand Down Expand Up @@ -36,11 +36,11 @@

. ../unittest/unittest.sh

require_test_type long

# covered by TEST3
configure_valgrind memcheck force-disable

require_test_type long

setup

# limit number of emitted logs due to excessive log size
Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_pmalloc_mt/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type long
require_valgrind 3.10
configure_valgrind helgrind force-enable
setup

Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_pmalloc_mt/TEST2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type medium
require_valgrind 3.10
configure_valgrind helgrind force-enable
setup

Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_pmalloc_mt/TEST3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type long
require_valgrind 3.10
configure_valgrind drd force-enable
setup

Expand Down
4 changes: 2 additions & 2 deletions src/test/obj_pmalloc_rand_mt/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2017-2019, Intel Corporation
# Copyright 2017-2023, Intel Corporation

#
# src/test/obj_pmalloc_rand_mt/TEST0 -- multithreaded allocator test
#

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem
require_test_type long
require_valgrind 3.10
configure_valgrind helgrind force-enable
setup

Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_reserve_mt/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type long
require_valgrind 3.10
configure_valgrind helgrind force-enable
setup

Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_reserve_mt/TEST2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type medium
require_valgrind 3.10
configure_valgrind helgrind force-enable
setup

Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_reserve_mt/TEST3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type long
require_valgrind 3.10
configure_valgrind drd force-enable
setup

Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_tx_alloc_mt/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type long
require_valgrind 3.10
configure_valgrind helgrind force-enable
setup

Expand Down
2 changes: 1 addition & 1 deletion src/test/obj_tx_alloc_mt/TEST2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

. ../unittest/unittest.sh

require_valgrind 3.10
require_fs_type pmem non-pmem
require_test_type medium
require_valgrind 3.10
configure_valgrind helgrind force-enable
setup

Expand Down
6 changes: 3 additions & 3 deletions src/test/obj_tx_flow/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2015-2019, Intel Corporation
# Copyright 2015-2023, Intel Corporation

#
# src/test/obj_tx_flow/TEST0 -- unit test for transaction flow
Expand All @@ -9,10 +9,10 @@
. ../unittest/unittest.sh

# this test verifies the correctness of the tx management functions only
configure_valgrind pmemcheck force-disable

require_test_type medium

configure_valgrind pmemcheck force-disable

setup

expect_normal_exit ./obj_tx_flow$EXESUFFIX f $DIR/testfile1
Expand Down
6 changes: 3 additions & 3 deletions src/test/obj_tx_locks/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2015-2019, Intel Corporation
# Copyright 2015-2023, Intel Corporation

#
# src/test/obj_tx_locks/TEST0 -- unit test for transaction locks
Expand All @@ -9,10 +9,10 @@
. ../unittest/unittest.sh

# this test verifies the correctness of the tx management functions only
configure_valgrind pmemcheck force-disable

require_test_type medium

configure_valgrind pmemcheck force-disable

setup

expect_normal_exit ./obj_tx_locks$EXESUFFIX $DIR/testfile1
Expand Down
6 changes: 3 additions & 3 deletions src/test/obj_zones/TEST0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2017-2019, Intel Corporation
# Copyright 2017-2023, Intel Corporation

. ../unittest/unittest.sh

require_test_type medium

# too large
configure_valgrind force-disable

require_test_type medium

setup

create_holey_file 64G $DIR/testfile1
Expand Down
6 changes: 3 additions & 3 deletions src/test/obj_zones/TEST1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2019, Intel Corporation
# Copyright 2023, Intel Corporation

. ../unittest/unittest.sh

require_test_type medium

# too large
configure_valgrind force-disable

require_test_type medium

# runs too long on debug builds
require_build_type nondebug

Expand Down
Loading