common: unify builds names - _debug instead of -debug

unify builds names - _debug instead of -debug
_nondebug instead of -nondebug

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>

.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',

.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',

.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:

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**

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

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),)
 #

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)

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"

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
 

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

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

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

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

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

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

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

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

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

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
 

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
 

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']
  #
 

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
 

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

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"