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.

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

Make selectable languages in integration tests #646

Merged
merged 1 commit into from
Jun 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tests/_integration/tests_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from collections import namedtuple

generate_for_languages = os.environ.get(
'GENERATE_LANGUAGES', 'ruby,python,js,node,go,php,rust')
'THEMIS_TEST_LANGUAGES', 'ruby,python,js,node,go,php,rust')
generate_for_languages = generate_for_languages.split(',')

LanguageSetting = namedtuple(
Expand Down
20 changes: 13 additions & 7 deletions tests/tools/check_keygen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

. tests/_integration/utils.sh

THEMIS_TEST_LANGUAGES="${THEMIS_TEST_LANGUAGES:-ruby,python,js,node,go,php,rust}"

test_lang() {
[[ " $(echo "$THEMIS_TEST_LANGUAGES" | sed 's/,/ /g') " =~ " $1 " ]]
}
Comment on lines +7 to +9
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit tricky comparison but it works, so I'm okay with it.


test_keygen () {
rm --force key key.pub test_key test_key.pub
bash -c "$1 $2"
Expand All @@ -19,12 +25,12 @@ test_keygen () {
check_result_zero
}

test_keygen python tools/python/keygen.py
test_keygen node tools/js/jsthemis/keygen.js
test_keygen node tools/js/wasm-themis/keygen.js
test_keygen "php -f" tools/php/keygen.php
test_keygen ruby tools/ruby/keygen.rb
test_keygen "go run" tools/go/keygen.go
test_keygen env tools/rust/keygen_tool.rust
test_lang 'python' && test_keygen python tools/python/keygen.py
test_lang 'node' && test_keygen node tools/js/jsthemis/keygen.js
test_lang 'js' && test_keygen node tools/js/wasm-themis/keygen.js
test_lang 'php' && test_keygen "php -f" tools/php/keygen.php
test_lang 'ruby' && test_keygen ruby tools/ruby/keygen.rb
test_lang 'go' && test_keygen "go run" tools/go/keygen.go
test_lang 'rust' && test_keygen env tools/rust/keygen_tool.rust

exit ${status}