Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: update test command #248

Merged
merged 3 commits into from
Nov 1, 2017
Merged

Makefile: update test command #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
055d4fe
add `install_all` target to makefile; move themissp tests to `test` t…
vixentael Nov 1, 2017
e6efc27
use `test` to test core, `test_all` to test all libs
vixentael Nov 1, 2017
44f1fa6
rename `test_spp` -> `test_cpp`
vixentael Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,8 @@ install_shared_libs: err all make_install_dirs

install: install_soter_headers install_themis_headers install_static_libs install_shared_libs

install_all: install themispp_install pythemis_install rubythemis_install phpthemis_install

get_version:
@echo $(VERSION)

Expand Down Expand Up @@ -532,7 +534,7 @@ symlink_realname_to_soname:
strip:
@find . -name \*.$(SHARED_EXT)\.* -exec strip -o {} {} \;

deb: test_basic soter_static themis_static soter_shared themis_shared collect_headers install_shell_scripts strip symlink_realname_to_soname
deb: test soter_static themis_static soter_shared themis_shared collect_headers install_shell_scripts strip symlink_realname_to_soname
@mkdir -p $(BIN_PATH)/deb

#libPACKAGE-dev
Expand Down Expand Up @@ -575,7 +577,7 @@ deb: test_basic soter_static themis_static soter_shared themis_shared collect_he
@find $(BIN_PATH) -name \*.deb


rpm: test_basic themis_static themis_shared soter_static soter_shared collect_headers install_shell_scripts strip symlink_realname_to_soname
rpm: test themis_static themis_shared soter_static soter_shared collect_headers install_shell_scripts strip symlink_realname_to_soname
@mkdir -p $(BIN_PATH)/rpm
#libPACKAGE-devel
@fpm --input-type dir \
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ test:
# we should calculate coverage for gothemis and send report before sending coverage of main C part
- '[ -z "$CIRCLE_PR_NUMBER" ] && ! [ -z "$COVERALLS_TOKEN" ] && cd $HOME/gopath/src/$GOTHEMIS_IMPORT && $HOME/gopath/bin/goveralls -v -service=circle-ci -repotoken=$COVERALLS_TOKEN || true'
- sudo /sbin/ldconfig
- make test_basic
- make test
- make test_php
- make test_python
- make test_js
Expand Down
18 changes: 13 additions & 5 deletions tests/test.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ themispp_test: $(THEMISPP_TEST_OBJ)
@echo -n "link "
@$(BUILD_CMD)

prepare_tests_basic: soter_test themis_test themispp_test
prepare_tests_basic: soter_test themis_test

prepare_tests_all: err prepare_tests_basic
prepare_tests_all: err prepare_tests_basic themispp_test
ifdef PHP_VERSION
@echo -n "make tests for phpthemis "
@echo "#!/bin/bash -e" > ./$(BIN_PATH)/tests/phpthemis_test.sh
Expand Down Expand Up @@ -102,15 +102,23 @@ endif



test_basic: prepare_tests_basic
test: prepare_tests_basic
@echo "------------------------------------------------------------"
@echo "Running themis-core basic tests."
$(TEST_BIN_PATH)/soter_test
@echo "------------------------------------------------------------"
$(TEST_BIN_PATH)/themis_test
@echo "------------------------------------------------------------"

# require all dependencies to be installed
test_cpp:
@echo "------------------------------------------------------------"
@echo "Running themissp tests."
@echo "If any error, check https://github.com/cossacklabs/themis/wiki/CPP-Howto"
@echo "------------------------------------------------------------"
$(TEST_BIN_PATH)/themispp_test
@echo "------------------------------------------------------------"

# require all dependencies
test_php:
ifdef PHP_VERSION
@echo "------------------------------------------------------------"
Expand Down Expand Up @@ -159,4 +167,4 @@ ifdef GO_VERSION
@go test -v $(GOTHEMIS_IMPORT)/...
endif

test: test_basic prepare_tests_all test_php test_python test_ruby test_js test_go
test_all: test prepare_tests_all test_cpp test_php test_python test_ruby test_js test_go