From 93f1eb32a19cf134f1968523134d93cd5f3bbb23 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 17 Jun 2023 20:40:41 +0200 Subject: [PATCH] common: unify builds names - _debug instead of -debug unify builds names - _debug instead of -debug _nondebug instead of -nondebug Signed-off-by: Tomasz Gromadzki --- .github/workflows/pmem_check.yml | 4 +-- .github/workflows/pmem_long.yml | 4 +-- .github/workflows/pmem_valgrind_sh.yml | 2 +- doc/pmempool/pmempool.1.md | 2 +- src/test/.gitignore | 4 +-- src/test/Makefile.inc | 4 +-- src/test/README | 18 ++++++------- src/test/RUNTESTS.sh | 8 +++--- src/test/blk_recovery/TEST0 | 4 +-- src/test/log_recovery/TEST0 | 4 +-- src/test/log_recovery/TEST1 | 4 +-- src/test/log_walker/TEST0 | 4 +-- src/test/obj_debug/TEST0 | 4 +-- src/test/obj_debug/TEST1 | 4 +-- src/test/obj_debug/TEST2 | 4 +-- src/test/obj_debug/TEST3 | 4 +-- src/test/obj_debug/TEST4 | 4 +-- src/test/obj_debug/TEST5 | 4 +-- src/test/pmem_movnt_align/TEST0 | 4 +-- src/test/pmem_movnt_align/TEST2 | 4 +-- src/test/testconfig.py.example | 2 +- src/test/testconfig.sh.example | 2 +- src/test/tools/anonymous_mmap/Makefile | 4 +-- .../tools/anonymous_mmap/check_max_mmap.sh | 4 +-- src/test/traces_pmem/TEST0 | 4 +-- src/test/unittest/builds.py | 4 +-- src/test/unittest/unittest.sh | 26 +++++++++---------- src/tools/.gitignore | 4 +-- src/tools/Makefile.inc | 4 +-- 29 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/pmem_check.yml b/.github/workflows/pmem_check.yml index c4d421fb2aa..b44595a1341 100644 --- a/.github/workflows/pmem_check.yml +++ b/.github/workflows/pmem_check.yml @@ -16,8 +16,8 @@ jobs: os: [[self-hosted, rhel],[self-hosted, opensuse]] config: ['check TEST_BUILD=debug', 'check TEST_BUILD=nondebug', - 'check TEST_BUILD=static-debug', - 'check TEST_BUILD=static-nondebug', + 'check TEST_BUILD=static_debug', + 'check TEST_BUILD=static_nondebug', 'pycheck TEST_BUILD=debug', 'pycheck TEST_BUILD=nondebug', 'pycheck TEST_BUILD=static_debug', diff --git a/.github/workflows/pmem_long.yml b/.github/workflows/pmem_long.yml index b2d52ca635a..38d471c8db4 100644 --- a/.github/workflows/pmem_long.yml +++ b/.github/workflows/pmem_long.yml @@ -20,8 +20,8 @@ jobs: os: [[self-hosted, rhel],[self-hosted, opensuse]] config: ['RUNTESTS.sh -t long -b debug', 'RUNTESTS.sh -t long -b nondebug', - 'RUNTESTS.sh -t long -b static-debug', - 'RUNTESTS.sh -t long -b static-nondebug', + 'RUNTESTS.sh -t long -b static_debug', + 'RUNTESTS.sh -t long -b static_nondebug', 'RUNTESTS.py -t long -b debug', 'RUNTESTS.py -t long -b nondebug', 'RUNTESTS.py -t long -b static_debug', diff --git a/.github/workflows/pmem_valgrind_sh.yml b/.github/workflows/pmem_valgrind_sh.yml index 2b1be3d923f..dee1f824752 100644 --- a/.github/workflows/pmem_valgrind_sh.yml +++ b/.github/workflows/pmem_valgrind_sh.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: config: ['drd', 'pmemcheck', 'memcheck', 'helgrind'] - build: ['debug', 'nondebug', 'static-debug', 'static-nondebug'] + build: ['debug', 'nondebug', 'static_debug', 'static_nondebug'] os: [[self-hosted, rhel],[self-hosted, opensuse]] env: diff --git a/doc/pmempool/pmempool.1.md b/doc/pmempool/pmempool.1.md index a9f9fc843ea..90b5a6cfba9 100644 --- a/doc/pmempool/pmempool.1.md +++ b/doc/pmempool/pmempool.1.md @@ -98,7 +98,7 @@ In order to get more information about specific *command* you can use **pmempool The debug logs are available only in the debug version of the tool, which is not provided by binary packages, but can be built from sources. -The **pmempool.static-debug** binary blob can be found +The **pmempool.static_debug** binary blob can be found in the 'src/tools/pmempool/' subdirectory. + **PMEMPOOL_TOOL_LOG_LEVEL** diff --git a/src/test/.gitignore b/src/test/.gitignore index b69ceaa895b..373f9574991 100644 --- a/src/test/.gitignore +++ b/src/test/.gitignore @@ -7,8 +7,8 @@ testconfig.py *.log testfile* # ignore static binaries generated for testing -*.static-debug -*.static-nondebug +*.static_debug +*.static_nondebug libs.tar *.synced .sync-dir diff --git a/src/test/Makefile.inc b/src/test/Makefile.inc index 0f66a9bf643..08418d11263 100644 --- a/src/test/Makefile.inc +++ b/src/test/Makefile.inc @@ -546,8 +546,8 @@ ifeq ($(COMPILE_LANG), cpp) LINKER=$(CXX) endif -SUFFIX_STATIC_DEBUG=static-debug -SUFFIX_STATIC_NONDEBUG=static-nondebug +SUFFIX_STATIC_DEBUG=static_debug +SUFFIX_STATIC_NONDEBUG=static_nondebug ifneq ($(TARGET),) # diff --git a/src/test/README b/src/test/README index e53f2f5403e..9041f2bf81a 100644 --- a/src/test/README +++ b/src/test/README @@ -41,20 +41,20 @@ how RUNTESTS.sh will run a test, use the -n option. For example: $ RUNTESTS.sh -n blk_nblock -s TEST0 (in ./blk_nblock) TEST=check FS=none BUILD=debug ./TEST0 (in ./blk_nblock) TEST=check FS=none BUILD=nondebug ./TEST0 - (in ./blk_nblock) TEST=check FS=none BUILD=static-debug ./TEST0 - (in ./blk_nblock) TEST=check FS=none BUILD=static-nondebug ./TEST0 + (in ./blk_nblock) TEST=check FS=none BUILD=static_debug ./TEST0 + (in ./blk_nblock) TEST=check FS=none BUILD=static_nondebug ./TEST0 (in ./blk_nblock) TEST=check FS=pmem BUILD=debug ./TEST0 (in ./blk_nblock) TEST=check FS=pmem BUILD=nondebug ./TEST0 - (in ./blk_nblock) TEST=check FS=pmem BUILD=static-debug ./TEST0 - (in ./blk_nblock) TEST=check FS=pmem BUILD=static-nondebug ./TEST0 + (in ./blk_nblock) TEST=check FS=pmem BUILD=static_debug ./TEST0 + (in ./blk_nblock) TEST=check FS=pmem BUILD=static_nondebug ./TEST0 (in ./blk_nblock) TEST=check FS=non-pmem BUILD=debug ./TEST0 (in ./blk_nblock) TEST=check FS=non-pmem BUILD=nondebug ./TEST0 - (in ./blk_nblock) TEST=check FS=non-pmem BUILD=static-debug ./TEST0 - (in ./blk_nblock) TEST=check FS=non-pmem BUILD=static-nondebug ./TEST0 + (in ./blk_nblock) TEST=check FS=non-pmem BUILD=static_debug ./TEST0 + (in ./blk_nblock) TEST=check FS=non-pmem BUILD=static_nondebug ./TEST0 (in ./blk_nblock) TEST=check FS=any BUILD=debug ./TEST0 (in ./blk_nblock) TEST=check FS=any BUILD=nondebug ./TEST0 - (in ./blk_nblock) TEST=check FS=any BUILD=static-debug ./TEST0 - (in ./blk_nblock) TEST=check FS=any BUILD=static-nondebug ./TEST0 + (in ./blk_nblock) TEST=check FS=any BUILD=static_debug ./TEST0 + (in ./blk_nblock) TEST=check FS=any BUILD=static_nondebug ./TEST0 Notice how the TEST0 script is run repeatedly with different settings for the three environment variables TEST, FS, and BUILD, providing the test type, @@ -68,7 +68,7 @@ RUNTESTS.sh takes options to limit what it runs. The usage is: [ --force-enable memcheck|pmemcheck|helgrind|drd ]] [ -c ] [tests...] - Build types are: debug, nondebug, static-debug, static-nondebug, all (default) + Build types are: debug, nondebug, static_debug, static_nondebug, all (default) Test types are: check (default), short, medium, long, all where: check = short + medium; all = short + medium + long File system types are: none, pmem, non-pmem, any, all (default) diff --git a/src/test/RUNTESTS.sh b/src/test/RUNTESTS.sh index 31e21f42096..7789ae7af77 100755 --- a/src/test/RUNTESTS.sh +++ b/src/test/RUNTESTS.sh @@ -22,7 +22,7 @@ Usage: $0 [ -hnv ] [ -b build-type ] [ -t test-type ] [ -f fs-type ] -n dry run -v be verbose -b build-type run only specified build type - build-type: debug, nondebug, static-debug, static-nondebug, all (default) + build-type: debug, nondebug, static_debug, static_nondebug, all (default) -t test-type run only specified test type test-type: check (default), short, medium, long, all where: check = short + medium; all = short + medium + long @@ -291,7 +291,7 @@ runtest() { } fss=$(intersection "$fstype" "$req_fstype" "none pmem non-pmem any") - builds=$(intersection "$buildtype" "$req_buildtype" "debug nondebug static-debug static-nondebug") + builds=$(intersection "$buildtype" "$req_buildtype" "debug nondebug static_debug static_nondebug") # for each fs-type being tested... for fs in $fss @@ -384,7 +384,7 @@ verbose_tests= [ -n "$KEEP_GOING" ] && keep_going=$KEEP_GOING [ -n "$VERBOSE_TESTS" ] && verbose_tests="$VERBOSE_TESTS" -PMEMDETECT="tools/pmemdetect/pmemdetect.static-nondebug" +PMEMDETECT="tools/pmemdetect/pmemdetect.static_nondebug" pmemdetect() { LD_LIBRARY_PATH=$LIBNDCTL_LD_LIBRARY_PATHS:$LD_LIBRARY_PATH $PMEMDETECT "$@" } @@ -475,7 +475,7 @@ do buildtype="$buildtype $2" case "$2" in - debug|nondebug|static-debug|static-nondebug|all) + debug|nondebug|static_debug|static_nondebug|all) ;; *) usage "bad build-type: $buildtype" diff --git a/src/test/blk_recovery/TEST0 b/src/test/blk_recovery/TEST0 index 3992157b1f6..95c2faec080 100755 --- a/src/test/blk_recovery/TEST0 +++ b/src/test/blk_recovery/TEST0 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2019, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # src/test/blk_recovery/TEST0 -- unit test for pmemblk recovery @@ -12,7 +12,7 @@ require_test_type medium # doesn't make sense to run in local directory require_fs_type pmem non-pmem -require_build_type nondebug static-nondebug +require_build_type nondebug static_nondebug setup diff --git a/src/test/log_recovery/TEST0 b/src/test/log_recovery/TEST0 index bd2e6b10b06..d3501d553de 100755 --- a/src/test/log_recovery/TEST0 +++ b/src/test/log_recovery/TEST0 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2019, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # src/test/log_recovery/TEST0 -- unit test for pmemlog recovery @@ -11,7 +11,7 @@ require_test_type medium -require_build_type nondebug static-nondebug +require_build_type nondebug static_nondebug # exits with locked mutexes configure_valgrind helgrind force-disable diff --git a/src/test/log_recovery/TEST1 b/src/test/log_recovery/TEST1 index 04cd4abbd54..058bc009751 100755 --- a/src/test/log_recovery/TEST1 +++ b/src/test/log_recovery/TEST1 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2019, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # src/test/log_recovery/TEST0 -- unit test for pmemlog recovery @@ -11,7 +11,7 @@ require_test_type medium -require_build_type nondebug static-nondebug +require_build_type nondebug static_nondebug # exits with locked mutexes configure_valgrind helgrind force-disable diff --git a/src/test/log_walker/TEST0 b/src/test/log_walker/TEST0 index 3cab6275f3f..3d6b53a412f 100755 --- a/src/test/log_walker/TEST0 +++ b/src/test/log_walker/TEST0 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2019, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # src/test/log_walker/TEST0 -- unit test to verify pool's write-protection @@ -11,7 +11,7 @@ require_test_type medium -require_build_type debug static-debug +require_build_type debug static_debug # exits without cleanup configure_valgrind force-disable diff --git a/src/test/obj_debug/TEST0 b/src/test/obj_debug/TEST0 index 92564c3b9f1..fc90c745eb1 100755 --- a/src/test/obj_debug/TEST0 +++ b/src/test/obj_debug/TEST0 @@ -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_debug/TEST0 -- unit test for debug features @@ -9,7 +9,7 @@ . ../unittest/unittest.sh require_test_type medium -require_build_type debug static-debug +require_build_type debug static_debug require_fs_type any setup diff --git a/src/test/obj_debug/TEST1 b/src/test/obj_debug/TEST1 index d0d9c5533d5..ab510258a16 100755 --- a/src/test/obj_debug/TEST1 +++ b/src/test/obj_debug/TEST1 @@ -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_debug/TEST1 -- unit test for debug features @@ -9,7 +9,7 @@ . ../unittest/unittest.sh require_test_type medium -require_build_type debug static-debug +require_build_type debug static_debug require_fs_type any setup diff --git a/src/test/obj_debug/TEST2 b/src/test/obj_debug/TEST2 index b5bfa716816..2da4ae945f3 100755 --- a/src/test/obj_debug/TEST2 +++ b/src/test/obj_debug/TEST2 @@ -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_debug/TEST2 -- unit test for debug features @@ -9,7 +9,7 @@ . ../unittest/unittest.sh require_test_type medium -require_build_type debug static-debug +require_build_type debug static_debug require_fs_type any # test causes 5 pmemcheck errors by design diff --git a/src/test/obj_debug/TEST3 b/src/test/obj_debug/TEST3 index 85130d27f97..87903894e43 100755 --- a/src/test/obj_debug/TEST3 +++ b/src/test/obj_debug/TEST3 @@ -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_debug/TEST3 -- unit test for debug features @@ -9,7 +9,7 @@ . ../unittest/unittest.sh require_test_type medium -require_build_type debug static-debug +require_build_type debug static_debug require_fs_type any setup diff --git a/src/test/obj_debug/TEST4 b/src/test/obj_debug/TEST4 index d4b24c0e911..49cc61aa3ae 100755 --- a/src/test/obj_debug/TEST4 +++ b/src/test/obj_debug/TEST4 @@ -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_debug/TEST4 -- unit test for debug features @@ -9,7 +9,7 @@ . ../unittest/unittest.sh require_test_type medium -require_build_type debug static-debug +require_build_type debug static_debug require_fs_type any setup diff --git a/src/test/obj_debug/TEST5 b/src/test/obj_debug/TEST5 index 36e1ef045cd..aed770b5042 100755 --- a/src/test/obj_debug/TEST5 +++ b/src/test/obj_debug/TEST5 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2019, Intel Corporation +# Copyright 2016-2023, Intel Corporation # # src/test/obj_debug/TEST5 -- unit test for debug features @@ -9,7 +9,7 @@ . ../unittest/unittest.sh require_test_type medium -require_build_type debug static-debug +require_build_type debug static_debug require_fs_type any FUNCS=17 diff --git a/src/test/pmem_movnt_align/TEST0 b/src/test/pmem_movnt_align/TEST0 index c7bc60d52ed..937915800d2 100755 --- a/src/test/pmem_movnt_align/TEST0 +++ b/src/test/pmem_movnt_align/TEST0 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2015-2022, Intel Corporation +# Copyright 2015-2023, Intel Corporation # # src/test/pmem_movnt_align/TEST0 -- unit test for pmem_memcpy_persist @@ -12,7 +12,7 @@ require_test_type medium require_x86_64 require_fs_type pmem non-pmem -require_build_type debug static-debug +require_build_type debug static_debug setup diff --git a/src/test/pmem_movnt_align/TEST2 b/src/test/pmem_movnt_align/TEST2 index 78cab06cf5a..7ef22107edb 100755 --- a/src/test/pmem_movnt_align/TEST2 +++ b/src/test/pmem_movnt_align/TEST2 @@ -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/pmem_movnt_align/TEST0 -- unit test for pmem_memcpy_persist @@ -11,7 +11,7 @@ require_test_type medium require_fs_type pmem non-pmem -require_build_type debug static-debug +require_build_type debug static_debug setup diff --git a/src/test/testconfig.py.example b/src/test/testconfig.py.example index 60570e5387f..5434ddbdbc8 100644 --- a/src/test/testconfig.py.example +++ b/src/test/testconfig.py.example @@ -85,7 +85,7 @@ config = { # # Set build type to be run: - # debug, release, static-debug, static-release, all + # debug, release, static_debug, static_nondebug, all # Can be a string or a list: ['debug', 'release'] # diff --git a/src/test/testconfig.sh.example b/src/test/testconfig.sh.example index 313b5a6fbbb..00c6da99edc 100644 --- a/src/test/testconfig.sh.example +++ b/src/test/testconfig.sh.example @@ -77,7 +77,7 @@ # # Overwrite available build types: -# debug, nondebug, static-debug, static-nondebug, all (default) +# debug, nondebug, static_debug, static_nondebug, all (default) # #TEST_BUILD=all diff --git a/src/test/tools/anonymous_mmap/Makefile b/src/test/tools/anonymous_mmap/Makefile index 762eca0d9ea..020f0add6fe 100644 --- a/src/test/tools/anonymous_mmap/Makefile +++ b/src/test/tools/anonymous_mmap/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018, Intel Corporation +# Copyright 2018-2023, Intel Corporation # # src/test/tools/anonymous_mmap/Makefile -- Makefile for anonymous_mmap @@ -19,5 +19,5 @@ TESTCONFIG=$(TOP)/src/test/testconfig.sh all: max_dax_devices -max_dax_devices: $(TESTCONFIG) check_max_mmap.sh anonymous_mmap.static-nondebug +max_dax_devices: $(TESTCONFIG) check_max_mmap.sh anonymous_mmap.static_nondebug @./check_max_mmap.sh diff --git a/src/test/tools/anonymous_mmap/check_max_mmap.sh b/src/test/tools/anonymous_mmap/check_max_mmap.sh index c5edc5e1ebc..6e6f9af47c0 100755 --- a/src/test/tools/anonymous_mmap/check_max_mmap.sh +++ b/src/test/tools/anonymous_mmap/check_max_mmap.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018, Intel Corporation +# Copyright 2018-2023, Intel Corporation # # src/test/tools/anonymous_mmap/check_max_mmap.sh -- checks how many DAX @@ -10,7 +10,7 @@ DIR_CHECK_MAX_MMAP="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" FILE_MAX_DAX_DEVICES="$DIR_CHECK_MAX_MMAP/max_dax_devices" -ANONYMOUS_MMAP="$DIR_CHECK_MAX_MMAP/anonymous_mmap.static-nondebug" +ANONYMOUS_MMAP="$DIR_CHECK_MAX_MMAP/anonymous_mmap.static_nondebug" source "$DIR_CHECK_MAX_MMAP/../../testconfig.sh" diff --git a/src/test/traces_pmem/TEST0 b/src/test/traces_pmem/TEST0 index 8a9e8139828..c0c74c8e343 100755 --- a/src/test/traces_pmem/TEST0 +++ b/src/test/traces_pmem/TEST0 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2019, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # src/test/traces_pmem/TEST0 -- unit test traces for libraries pmem @@ -11,7 +11,7 @@ require_test_type medium require_fs_type none -require_build_type debug static-debug +require_build_type debug static_debug setup diff --git a/src/test/unittest/builds.py b/src/test/unittest/builds.py index d4aff17b8c8..c933761d506 100644 --- a/src/test/unittest/builds.py +++ b/src/test/unittest/builds.py @@ -48,7 +48,7 @@ class Static_Debug(Build): """Set this context for a static_debug build""" def __init__(self): - self.exesuffix = '.static-debug' + self.exesuffix = '.static_debug' self.libdir = c.DEBUG_LIBDIR @@ -56,7 +56,7 @@ class Static_Nondebug(Build): """Set this context for a static_nondebug build""" def __init__(self): - self.exesuffix = '.static-nondebug' + self.exesuffix = '.static_nondebug' self.libdir = c.NONDEBUG_LIBDIR diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh index 6998f59e3ff..b06310e7aff 100644 --- a/src/test/unittest/unittest.sh +++ b/src/test/unittest/unittest.sh @@ -126,21 +126,21 @@ LIB_TOOLS="../../tools" # Paths to some useful tools [ "$PMEMPOOL" ] || PMEMPOOL=$LIB_TOOLS/pmempool/pmempool [ "$DAXIO" ] || DAXIO=$LIB_TOOLS/daxio/daxio -[ "$PMEMSPOIL" ] || PMEMSPOIL=$TOOLS/pmemspoil/pmemspoil.static-nondebug -[ "$BTTCREATE" ] || BTTCREATE=$TOOLS/bttcreate/bttcreate.static-nondebug +[ "$PMEMSPOIL" ] || PMEMSPOIL=$TOOLS/pmemspoil/pmemspoil.static_nondebug +[ "$BTTCREATE" ] || BTTCREATE=$TOOLS/bttcreate/bttcreate.static_nondebug [ "$PMEMWRITE" ] || PMEMWRITE=$TOOLS/pmemwrite/pmemwrite [ "$PMEMALLOC" ] || PMEMALLOC=$TOOLS/pmemalloc/pmemalloc [ "$PMEMOBJCLI" ] || PMEMOBJCLI=$TOOLS/pmemobjcli/pmemobjcli -[ "$PMEMDETECT" ] || PMEMDETECT=$TOOLS/pmemdetect/pmemdetect.static-nondebug +[ "$PMEMDETECT" ] || PMEMDETECT=$TOOLS/pmemdetect/pmemdetect.static_nondebug [ "$PMREORDER" ] || PMREORDER=$LIB_TOOLS/pmreorder/pmreorder.py [ "$FIP" ] || FIP=$TOOLS/fip/fip [ "$DDMAP" ] || DDMAP=$TOOLS/ddmap/ddmap [ "$CMPMAP" ] || CMPMAP=$TOOLS/cmpmap/cmpmap [ "$EXTENTS" ] || EXTENTS=$TOOLS/extents/extents -[ "$FALLOCATE_DETECT" ] || FALLOCATE_DETECT=$TOOLS/fallocate_detect/fallocate_detect.static-nondebug +[ "$FALLOCATE_DETECT" ] || FALLOCATE_DETECT=$TOOLS/fallocate_detect/fallocate_detect.static_nondebug [ "$OBJ_VERIFY" ] || OBJ_VERIFY=$TOOLS/obj_verify/obj_verify -[ "$USC_PERMISSION" ] || USC_PERMISSION=$TOOLS/usc_permission_check/usc_permission_check.static-nondebug -[ "$ANONYMOUS_MMAP" ] || ANONYMOUS_MMAP=$TOOLS/anonymous_mmap/anonymous_mmap.static-nondebug +[ "$USC_PERMISSION" ] || USC_PERMISSION=$TOOLS/usc_permission_check/usc_permission_check.static_nondebug +[ "$ANONYMOUS_MMAP" ] || ANONYMOUS_MMAP=$TOOLS/anonymous_mmap/anonymous_mmap.static_nondebug # force globs to fail if they don't match shopt -s failglob @@ -177,14 +177,14 @@ STRACE="strace" case "$BUILD" in -debug|static-debug) +debug|static_debug) if [ -z "$PMDK_LIB_PATH_DEBUG" ]; then PMDK_LIB_PATH=../../debug else PMDK_LIB_PATH=$PMDK_LIB_PATH_DEBUG fi ;; -nondebug|static-nondebug) +nondebug|static_nondebug) if [ -z "$PMDK_LIB_PATH_NONDEBUG" ]; then PMDK_LIB_PATH=../../nondebug else @@ -809,7 +809,7 @@ function check_pool() { then echo "$UNITTEST_NAME: checking consistency of pool ${1}" fi - ${PMEMPOOL}.static-nondebug check $1 2>&1 1>>$CHECK_POOL_LOG_FILE + ${PMEMPOOL}.static_nondebug check $1 2>&1 1>>$CHECK_POOL_LOG_FILE fi } @@ -1098,7 +1098,7 @@ get_node_devdax_path() { dax_device_zero() { for path in ${DEVICE_DAX_PATH[@]} do - ${PMEMPOOL}.static-debug rm -f $path + ${PMEMPOOL}.static_debug rm -f $path done } @@ -1573,10 +1573,10 @@ function require_no_asan() { nondebug) require_no_asan_for ../../nondebug/libpmem.so ;; - static-debug) + static_debug) require_no_asan_for ../../debug/libpmem.a ;; - static-nondebug) + static_nondebug) require_no_asan_for ../../nondebug/libpmem.a ;; esac @@ -2104,7 +2104,7 @@ check_arena() # function dump_pool_info() { # ignore selected header fields that differ by definition - ${PMEMPOOL}.static-nondebug info $* | sed -e "/^UUID/,/^Checksum/d" + ${PMEMPOOL}.static_nondebug info $* | sed -e "/^UUID/,/^Checksum/d" } # diff --git a/src/tools/.gitignore b/src/tools/.gitignore index 11dc3fb7618..9d8f914eded 100644 --- a/src/tools/.gitignore +++ b/src/tools/.gitignore @@ -2,6 +2,6 @@ TAGS cscope.in.out cscope.po.out cscope.out -*.static-debug -*.static-nondebug +*.static_debug +*.static_nondebug .synced diff --git a/src/tools/Makefile.inc b/src/tools/Makefile.inc index 9ac1374d9f2..6b3901ae95d 100644 --- a/src/tools/Makefile.inc +++ b/src/tools/Makefile.inc @@ -93,9 +93,9 @@ BASH_COMP_FILES ?= BASH_COMP_DESTDIR = $(DESTDIR)$(bashcompdir) ifneq ($(DEBUG),1) -TARGET_STATIC_NONDEBUG=$(TARGET).static-nondebug +TARGET_STATIC_NONDEBUG=$(TARGET).static_nondebug endif -TARGET_STATIC_DEBUG=$(TARGET).static-debug +TARGET_STATIC_DEBUG=$(TARGET).static_debug LIBSDIR=$(TOP)/src LIBSDIR_DEBUG=$(LIBSDIR)/debug