Skip to content

Commit

Permalink
Merge 68478c1 into 94ab77b
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtDu committed Oct 23, 2022
2 parents 94ab77b + 68478c1 commit 6d99563
Show file tree
Hide file tree
Showing 9 changed files with 568 additions and 823 deletions.
1 change: 0 additions & 1 deletion .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ include_files = {

exclude_files = {
'.rocks',
'test.lua',
}
18 changes: 0 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ LUACOV_STATS := $(PROJECT_DIR)/luacov.stats.out
SHELL := $(shell which bash) # Required for brace expansion used in a clean target.
SEED ?= $(shell /bin/bash -c "echo $$RANDOM")

CLEANUP_FILES = tarantool.log
CLEANUP_FILES += *.index
CLEANUP_FILES += *.run
CLEANUP_FILES += *.snap
CLEANUP_FILES += *.vylog
CLEANUP_FILES += *.xlog
CLEANUP_FILES += 51{2,3,4,5,6,7,8,9} # Directories that vinyl creates.

all: test

# The template (ldoc.tpl) is written using tarantool specific
Expand All @@ -34,13 +26,6 @@ luacheck:
.PHONY: test
test:
luatest -v --coverage --shuffle all:${SEED}
rm -rf ${CLEANUP_FILES}
INDEX_TYPE='TREE' SPACE_TYPE='vinyl' ./test.lua
rm -rf ${CLEANUP_FILES}
INDEX_TYPE='HASH' ./test.lua
rm -rf ${CLEANUP_FILES}
INDEX_TYPE='TREE' ./test.lua
rm -rf ${CLEANUP_FILES}

$(LUACOV_STATS): test

Expand All @@ -64,6 +49,3 @@ deps:
deps-full: deps
tarantoolctl rocks install cartridge 2.7.4
tarantoolctl rocks install metrics 0.13.0

clean:
rm -rf ${CLEANUP_FILES}
Loading

0 comments on commit 6d99563

Please sign in to comment.