ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-12-30 01:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-tests: unify testdb name.

Browse Source
This commit is contained in:
Leo Yuriev 2018-03-19 20:41:08 +03:00
parent 838856f688
commit 52283d8c44
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -32,8 +32,8 @@ endif
XCFLAGS ?= -DNDEBUG=1 -DMDBX_DEBUG=0 -DLIBMDBX_EXPORTS=1 XCFLAGS ?= -DNDEBUG=1 -DMDBX_DEBUG=0 -DLIBMDBX_EXPORTS=1
CFLAGS += -D_GNU_SOURCE=1 -std=gnu11 -pthread $(XCFLAGS) CFLAGS += -D_GNU_SOURCE=1 -std=gnu11 -pthread $(XCFLAGS)
CXXFLAGS = -std=c++11 $(filter-out -std=gnu11,$(CFLAGS)) CXXFLAGS = -std=c++11 $(filter-out -std=gnu11,$(CFLAGS))
TESTDB ?= $(shell [ -d /dev/shm ] && echo /dev/shm || echo /tmp)/mdbx-check.db TESTDB ?= $(shell [ -d /dev/shm ] && echo /dev/shm || echo /tmp)/mdbx-test.db
TESTLOG ?= $(shell [ -d /dev/shm ] && echo /dev/shm || echo /tmp)/mdbx-check.log TESTLOG ?= $(shell [ -d /dev/shm ] && echo /dev/shm || echo /tmp)/mdbx-test.log
# LY: '--no-as-needed,-lrt' for ability to built with modern glibc, but then run with the old # LY: '--no-as-needed,-lrt' for ability to built with modern glibc, but then run with the old
LDFLAGS ?= -Wl,--gc-sections,-z,relro,-O,--no-as-needed,-lrt LDFLAGS ?= -Wl,--gc-sections,-z,relro,-O,--no-as-needed,-lrt

2
TODO.md
View File

@ -21,7 +21,7 @@
Тесты Тесты
===== =====
- [ ] Тестирование поддержки lockless-режима. - [ ] Тестирование поддержки lockless-режима.
- [ ] Додумать имя и размещение тестовой БД по-умолчанию. - [x] Додумать имя и размещение тестовой БД по-умолчанию.
- [ ] Реализовать cleanup в тесте. - [ ] Реализовать cleanup в тесте.
- [ ] usage для теста. - [ ] usage для теста.
- [ ] Логирование в файл, плюс более полный progress bar. - [ ] Логирование в файл, плюс более полный progress bar.

2
test/config.h
View File

@ -245,7 +245,7 @@ void dump(const char *title = "config-dump: ");
struct actor_params : public config::actor_params_pod { struct actor_params : public config::actor_params_pod {
std::string pathname_log; std::string pathname_log;
std::string pathname_db; std::string pathname_db;
void set_defaults(void); void set_defaults(const std::string &tmpdir);
}; };
struct actor_config : public config::actor_config_pod { struct actor_config : public config::actor_config_pod {

11
test/main.cc
View File

@ -22,7 +22,7 @@ void __noreturn usage(void) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void actor_params::set_defaults(void) { void actor_params::set_defaults(const std::string &tmpdir) {
pathname_log = ""; pathname_log = "";
loglevel = loglevel =
#ifdef NDEBUG #ifdef NDEBUG
@ -31,12 +31,7 @@ void actor_params::set_defaults(void) {
logging::trace; logging::trace;
#endif #endif
pathname_db = pathname_db = tmpdir + "mdbx-test.db";
#ifdef __linux__
"/dev/shm/test_tmpdb.mdbx";
#else
"test_tmpdb.mdbx";
#endif
mode_flags = MDBX_NOSUBDIR | MDBX_WRITEMAP | MDBX_MAPASYNC | MDBX_NORDAHEAD | mode_flags = MDBX_NOSUBDIR | MDBX_WRITEMAP | MDBX_MAPASYNC | MDBX_NORDAHEAD |
MDBX_NOMEMINIT | MDBX_COALESCE | MDBX_LIFORECLAIM; MDBX_NOMEMINIT | MDBX_COALESCE | MDBX_LIFORECLAIM;
table_flags = MDBX_DUPSORT; table_flags = MDBX_DUPSORT;
@ -135,7 +130,7 @@ int main(int argc, char *const argv[]) {
: EXIT_FAILURE; : EXIT_FAILURE;
actor_params params; actor_params params;
params.set_defaults(); params.set_defaults(osal_tempdir());
global::config::dump_config = true; global::config::dump_config = true;
logging::setup((logging::loglevel)params.loglevel, "main"); logging::setup((logging::loglevel)params.loglevel, "main");
unsigned last_space_id = 0; unsigned last_space_id = 0;