From c1147c5be2bb64463b0e946ee4b78b55e028dbec Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Sat, 17 Jun 2023 19:16:38 +0200 Subject: [PATCH] common: unify builds names - `nondebug` instead of `release` Signed-off-by: Tomasz Gromadzki --- .github/workflows/pmem_check.yml | 4 ++-- .github/workflows/pmem_long.yml | 4 ++-- .github/workflows/pmem_valgrind_py.yml | 2 +- src/test/Makefile.inc | 2 +- src/test/ex_libpmem2/TESTS.py | 2 +- src/test/obj_fragmentation2/TESTS.py | 4 ++-- src/test/obj_ulog_size/TESTS.py | 4 ++-- src/test/scope/TESTS.py | 2 +- src/test/unittest/builds.py | 12 ++++++------ src/test/unittest/consts.py | 2 +- src/test/unittest/futils.py | 2 +- utils/docker/configure-tests.sh | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pmem_check.yml b/.github/workflows/pmem_check.yml index 2e03e42131c..c4d421fb2aa 100644 --- a/.github/workflows/pmem_check.yml +++ b/.github/workflows/pmem_check.yml @@ -19,9 +19,9 @@ jobs: 'check TEST_BUILD=static-debug', 'check TEST_BUILD=static-nondebug', 'pycheck TEST_BUILD=debug', - 'pycheck TEST_BUILD=release', + 'pycheck TEST_BUILD=nondebug', 'pycheck TEST_BUILD=static_debug', - 'pycheck TEST_BUILD=static_release'] + 'pycheck TEST_BUILD=static_nondebug'] env: WORKDIR: utils/gha-runners diff --git a/.github/workflows/pmem_long.yml b/.github/workflows/pmem_long.yml index 1235022defd..b2d52ca635a 100644 --- a/.github/workflows/pmem_long.yml +++ b/.github/workflows/pmem_long.yml @@ -23,9 +23,9 @@ jobs: '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 release', + 'RUNTESTS.py -t long -b nondebug', 'RUNTESTS.py -t long -b static_debug', - 'RUNTESTS.py -t long -b static_release'] + 'RUNTESTS.py -t long -b static_nondebug'] env: WORKDIR: utils/gha-runners diff --git a/.github/workflows/pmem_valgrind_py.yml b/.github/workflows/pmem_valgrind_py.yml index aaab4357c71..b11211b9c77 100644 --- a/.github/workflows/pmem_valgrind_py.yml +++ b/.github/workflows/pmem_valgrind_py.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: config: ['drd', 'pmemcheck', 'memcheck', 'helgrind'] - build: ['debug', 'release', 'static_debug', 'static_release'] + build: ['debug', 'nondebug', 'static_debug', 'static_nondebug'] os: [[self-hosted, rhel],[self-hosted, opensuse]] env: diff --git a/src/test/Makefile.inc b/src/test/Makefile.inc index e38f5d0bb6b..0f66a9bf643 100644 --- a/src/test/Makefile.inc +++ b/src/test/Makefile.inc @@ -626,7 +626,7 @@ TSTCHECKS=$(shell ls -1 TEST* 2> /dev/null | grep '^TEST[0-9]\+$$' | sort -V) TSTCHECKSPY=$(shell test -f TESTS.py && cd .. && ./RUNTESTS.py --list-testcases $(TST) | while read name; do echo py/$$name; done) $(TSTCHECKSPY): - @cd .. && ./RUNTESTS.py $(subst nondebug,release,$(RUNTEST_OPTIONS)) -u $(shell echo $@ | sed 's/^py\/[^0-9]*\([0-9]*\)$$/\1/') -- ${TST} + @cd .. && ./RUNTESTS.py $(RUNTEST_OPTIONS) -u $(shell echo $@ | sed 's/^py\/[^0-9]*\([0-9]*\)$$/\1/') -- ${TST} $(TSTCHECKS): sync-test @cd .. && ./RUNTESTS.sh ${TST} $(RUNTEST_OPTIONS) -s $@ diff --git a/src/test/ex_libpmem2/TESTS.py b/src/test/ex_libpmem2/TESTS.py index e1d0f02c589..7b4bbd50baa 100755 --- a/src/test/ex_libpmem2/TESTS.py +++ b/src/test/ex_libpmem2/TESTS.py @@ -7,7 +7,7 @@ from testframework import granularity as g -@t.require_build(['debug', 'release']) +@t.require_build(['debug', 'nondebug']) class EX_LIBPMEM2(t.Test): test_type = t.Medium file_size = 1 * t.MiB diff --git a/src/test/obj_fragmentation2/TESTS.py b/src/test/obj_fragmentation2/TESTS.py index 1808f4cfc0b..303e224bafb 100755 --- a/src/test/obj_fragmentation2/TESTS.py +++ b/src/test/obj_fragmentation2/TESTS.py @@ -1,6 +1,6 @@ #!../env.py # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019-2020, Intel Corporation +# Copyright 2019-2023, Intel Corporation # from os import path @@ -10,7 +10,7 @@ @g.require_granularity(g.CACHELINE) -@t.require_build('release') +@t.require_build('nondebug') class Base(t.Test): test_type = t.Long seed = '12345' diff --git a/src/test/obj_ulog_size/TESTS.py b/src/test/obj_ulog_size/TESTS.py index 580c308575d..3b9d10d4566 100755 --- a/src/test/obj_ulog_size/TESTS.py +++ b/src/test/obj_ulog_size/TESTS.py @@ -1,12 +1,12 @@ #!../env.py # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019-2020, Intel Corporation +# Copyright 2019-2023, Intel Corporation import testframework as t -@t.require_build(['debug', 'release']) +@t.require_build(['debug', 'nondebug']) class BASE(t.Test): test_type = t.Medium diff --git a/src/test/scope/TESTS.py b/src/test/scope/TESTS.py index 399ebfa29ab..c094b4cfb3d 100755 --- a/src/test/scope/TESTS.py +++ b/src/test/scope/TESTS.py @@ -60,7 +60,7 @@ class Common(t.Test): def run(self, ctx): static = False - if str(self.ctx.build) in ['debug', 'release']: + if str(self.ctx.build) in ['debug', 'nondebug']: lib = '{}.so.1'.format(self.checked_lib) else: static = True diff --git a/src/test/unittest/builds.py b/src/test/unittest/builds.py index 17b682d77ca..d4aff17b8c8 100644 --- a/src/test/unittest/builds.py +++ b/src/test/unittest/builds.py @@ -35,12 +35,12 @@ def __init__(self): self.env = {'LD_LIBRARY_PATH': self.libdir} -class Release(Build): - """Set this context for a release build""" +class NonDebug(Build): + """Set this context for a nondebug build""" is_preferred = True def __init__(self): - self.libdir = c.RELEASE_LIBDIR + self.libdir = c.NONDEBUG_LIBDIR self.env = {'LD_LIBRARY_PATH': self.libdir} @@ -52,12 +52,12 @@ def __init__(self): self.libdir = c.DEBUG_LIBDIR -class Static_Release(Build): - """Set this context for a static_release build""" +class Static_Nondebug(Build): + """Set this context for a static_nondebug build""" def __init__(self): self.exesuffix = '.static-nondebug' - self.libdir = c.RELEASE_LIBDIR + self.libdir = c.NONDEBUG_LIBDIR def require_build(build, **kwargs): diff --git a/src/test/unittest/consts.py b/src/test/unittest/consts.py index 1c94d8cf602..01777cb1c69 100644 --- a/src/test/unittest/consts.py +++ b/src/test/unittest/consts.py @@ -12,7 +12,7 @@ ROOTDIR = abspath(join(dirname(__file__), '..')) DEBUG_LIBDIR = abspath(join(ROOTDIR, '..', 'debug')) -RELEASE_LIBDIR = abspath(join(ROOTDIR, '..', 'nondebug')) +NONDEBUG_LIBDIR = abspath(join(ROOTDIR, '..', 'nondebug')) HEADER_SIZE = 4096 diff --git a/src/test/unittest/futils.py b/src/test/unittest/futils.py index 657002f7c48..d79f9e6c95a 100644 --- a/src/test/unittest/futils.py +++ b/src/test/unittest/futils.py @@ -23,7 +23,7 @@ def get_lib_dir(ctx): if str(ctx.build) == 'debug': return c.DEBUG_LIBDIR else: - return c.RELEASE_LIBDIR + return c.NONDEBUG_LIBDIR def get_example_path(ctx, libname, name, dirname=None): diff --git a/utils/docker/configure-tests.sh b/utils/docker/configure-tests.sh index dd0876a1279..abe2a1f74bc 100755 --- a/utils/docker/configure-tests.sh +++ b/utils/docker/configure-tests.sh @@ -49,7 +49,7 @@ config = { 'fs_dir_force_pmem': 0, 'keep_going': False, 'timeout': '3m', - 'build': ['debug', 'release'], + 'build': ['debug', 'nondebug'], 'force_enable': None, 'device_dax_path': [], 'fail_on_skip': False,