From ca8e9fe7b19431070e3357099830c065c66220cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Wed, 6 Nov 2024 22:55:54 +0300 Subject: [PATCH] =?UTF-8?q?mdbx-testing:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81?= =?UTF-8?q?=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=20`stochastic.sh`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog.md | 4 ++-- GNUmakefile | 16 ++++++++-------- README.md | 6 +++--- test/battery-tmux.sh | 2 +- test/{long_stochastic.sh => stochastic.sh} | 0 5 files changed, 14 insertions(+), 14 deletions(-) rename test/{long_stochastic.sh => stochastic.sh} (100%) diff --git a/ChangeLog.md b/ChangeLog.md index a05af74e..d98a95c0 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -756,7 +756,7 @@ Signed-off-by: Леонид Юрьев (Leonid Yuriev) все они были несущественные, либо ложные. - Устранено ложное предупреждение GCC при сборке для SH4. - Добавлена поддержка ASAN (Address Sanitizer) при сборке посредством MSVC. - - Расширен набор перебираемых режимов в скрипте `test/long_stochastic.sh`, + - Расширен набор перебираемых режимов в скрипте `test/stochastic.sh`, добавлена опция `--extra`. - В C++ API добавлена поддержка расширенных опций времени выполнения `mdbx::extra_runtime_option`, аналогично `enum MDBX_option_t` из C API. @@ -1066,7 +1066,7 @@ Signed-off-by: Леонид Юрьев (Leonid Yuriev) - Уменьшение в 42 раза значения по-умолчанию для `me_options.dp_limit` в отладочных сборках. - Добавление платформы `gcc-riscv64-linux-gnu` в список для цели `cross-gcc`. - - Небольшие правки скрипта `long_stochastic.sh` для работы в Windows. + - Небольшие правки скрипта `stochastic.sh` для работы в Windows. - Удаление ненужного вызова `LockFileEx()` внутри `mdbx_env_copy()`. - Добавлено описание использования файловых дескрипторов в различных режимах. - Добавлено использование `_CrtDbgReport()` в отладочных сборках. diff --git a/GNUmakefile b/GNUmakefile index 2b404988..5c5a20fd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -425,23 +425,23 @@ smoke-fault: build-test ; ./mdbx_chk -vvnw $(TEST_DB) && ([ ! -e $(TEST_DB)-copy ] || ./mdbx_chk -vvn $(TEST_DB)-copy) test: build-test - @echo ' RUNNING `test/long_stochastic.sh --loops 2`...' - $(QUIET)test/long_stochastic.sh --dont-check-ram-size --loops 2 --db-upto-mb 256 --skip-make --taillog >$(TEST_LOG) || (cat $(TEST_LOG) && false) + @echo ' RUNNING `test/stochastic.sh --loops 2`...' + $(QUIET)test/stochastic.sh --dont-check-ram-size --loops 2 --db-upto-mb 256 --skip-make --taillog >$(TEST_LOG) || (cat $(TEST_LOG) && false) long-test: test-long test-long: build-test - @echo ' RUNNING `test/long_stochastic.sh --loops 42`...' - $(QUIET)test/long_stochastic.sh --loops 42 --db-upto-mb 1024 --extra --skip-make --taillog + @echo ' RUNNING `test/stochastic.sh --loops 42`...' + $(QUIET)test/stochastic.sh --loops 42 --db-upto-mb 1024 --extra --skip-make --taillog test-singleprocess: build-test - @echo ' RUNNING `test/long_stochastic.sh --single --loops 2`...' - $(QUIET)test/long_stochastic.sh --dont-check-ram-size --single --loops 2 --db-upto-mb 256 --skip-make --taillog >$(TEST_LOG) || (cat $(TEST_LOG) && false) + @echo ' RUNNING `test/stochastic.sh --single --loops 2`...' + $(QUIET)test/stochastic.sh --dont-check-ram-size --single --loops 2 --db-upto-mb 256 --skip-make --taillog >$(TEST_LOG) || (cat $(TEST_LOG) && false) test-valgrind: test-memcheck test-memcheck: CFLAGS_EXTRA=-Ofast -DENABLE_MEMCHECK test-memcheck: build-test - @echo ' RUNNING `test/long_stochastic.sh --with-valgrind --loops 2`...' - $(QUIET)test/long_stochastic.sh --with-valgrind --loops 2 --db-upto-mb 256 --skip-make >$(TEST_LOG) || (cat $(TEST_LOG) && false) + @echo ' RUNNING `test/stochastic.sh --with-valgrind --loops 2`...' + $(QUIET)test/stochastic.sh --with-valgrind --loops 2 --db-upto-mb 256 --skip-make >$(TEST_LOG) || (cat $(TEST_LOG) && false) memcheck: smoke-memcheck smoke-memcheck: VALGRIND=valgrind --trace-children=yes --log-file=valgrind-%p.log --leak-check=full --track-origins=yes --read-var-info=yes --error-exitcode=42 --suppressions=test/valgrind_suppress.txt diff --git a/README.md b/README.md index ecc95b0a..1fbf8e65 100644 --- a/README.md +++ b/README.md @@ -472,7 +472,7 @@ Therefore, only basic information is provided: - The `Makefile` provide several self-described targets for testing: `smoke`, `test`, `check`, `memcheck`, `test-valgrind`, `test-asan`, `test-leak`, `test-ubsan`, `cross-gcc`, `cross-qemu`, `gcc-analyzer`, `smoke-fault`, `smoke-singleprocess`, `test-singleprocess`, 'long-test'. Please run `make --help` if doubt. - - In addition to the `mdbx_test` utility, there is the script [`long_stochastic.sh`](https://gitflic.ru/project/erthink/libmdbx/blob/master/test/long_stochastic.sh), + - In addition to the `mdbx_test` utility, there is the script [`stochastic.sh`](https://gitflic.ru/project/erthink/libmdbx/blob/master/test/stochastic.sh), which calls `mdbx_test` by going through set of modes and options, with gradually increasing the number of operations and the size of transactions. This script is used for mostly of all automatic testing, including `Makefile` targets and Continuous Integration. - Brief information of available command-line options is available by `--help`. @@ -583,7 +583,7 @@ during configure by CMake. An example of running a basic test script can be found in the [CI-script](appveyor.yml) for [AppVeyor](https://www.appveyor.com/). To -run the [long stochastic test scenario](test/long_stochastic.sh), +run the [long stochastic test scenario](test/stochastic.sh), [bash](https://en.wikipedia.org/wiki/Bash_(Unix_shell)) is required, and such testing is recommended with placing the test data on the [RAM-disk](https://en.wikipedia.org/wiki/RAM_drive). @@ -603,7 +603,7 @@ directory with source code, and run `make check` to execute the base tests. If something goes wrong, it is recommended to install [Homebrew](https://brew.sh/) and try again. -To run the [long stochastic test scenario](test/long_stochastic.sh), you +To run the [long stochastic test scenario](test/stochastic.sh), you will need to install the current (not outdated) version of [Bash](https://en.wikipedia.org/wiki/Bash_(Unix_shell)). To do this, we recommend that you install [Homebrew](https://brew.sh/) and then execute diff --git a/test/battery-tmux.sh b/test/battery-tmux.sh index fba52064..65c3178e 100755 --- a/test/battery-tmux.sh +++ b/test/battery-tmux.sh @@ -3,7 +3,7 @@ # Леонид Юрьев aka Leonid Yuriev # SPDX-License-Identifier: Apache-2.0 -TEST="./test/long_stochastic.sh --skip-make --db-upto-gb 32" +TEST="./test/stochastic.sh --skip-make --db-upto-gb 32" PREFIX="/dev/shm/mdbxtest-" tmux kill-session -t mdbx diff --git a/test/long_stochastic.sh b/test/stochastic.sh similarity index 100% rename from test/long_stochastic.sh rename to test/stochastic.sh