-
Notifications
You must be signed in to change notification settings - Fork 143
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
PHP-tests fixes #285
Merged
PHP-tests fixes #285
Changes from all commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
bb43348
php tests with composer setup
mozhmike b7700dc
php tests fix
mozhmike 2b9cf5b
Merge branch 'master' of https://github.com/cossacklabs/themis into p…
mozhmike cb9c8ce
fix tests
Lagovas 9d00125
Force env init before tests
mozhmike 51afdd0
Merge branch 'php-tests' of https://github.com/cossacklabs/themis int…
mozhmike 7cf5e2e
fix session in extension
Lagovas 0ba9d86
Merge remote-tracking branch 'origin/php-tests' into php-tests
Lagovas 42dd7cb
Merge remote-tracking branch 'origin/master' into php-tests
Lagovas 7207acd
Merge remote-tracking branch 'origin' into php-tests
6ed02f5
Makefiles for php-tests
mozhmike e9f9176
Merge branch 'php-tests' of https://github.com/cossacklabs/themis int…
9b14dab
Merge branch 'master' into php-tests
mozhmike e282d00
Merge remote-tracking branch 'origin/master' into php-tests
Lagovas 7ec9f07
small readme fix
vixentael 45cd178
Makefiles for php-tests
mozhmike 076aef3
Merge branch 'php-tests' of https://github.com/cossacklabs/themis int…
mozhmike 1c4b1cf
apt-get php5-dev
mozhmike bbec1ef
Circle-ci php env
mozhmike 537c97d
Circle-ci php env
mozhmike f2a2324
merge
mozhmike 40a4826
Make for php-tests
mozhmike 2d3d76d
Make for php-tests
mozhmike 7f9c5f6
Circle-ci config for phpize link
mozhmike 1c10c0a
Circle-ci config for php-config link
mozhmike bb3e144
fix for php test
mozhmike d1c6e25
Circle build setting push
mozhmike 0b10bf6
Isolate python test
mozhmike cb6b509
Revert python test isolation
mozhmike f496659
explicitly use python2
Lagovas fa3d5d6
force rebuild
Lagovas 1a09908
fix setuptools error
Lagovas ca80c66
fix editor newline
Lagovas e4c43a1
fix gcov usage
Lagovas 26edb33
setup python3 version
Lagovas ff6ef8c
force rebuild
Lagovas 5627816
fix installing python
Lagovas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#!/bin/bash -e | ||
|
||
rm composer.json | ||
rm -f composer.json | ||
ln -s composer-php5.6.json composer.json | ||
php composer.phar update |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
#!/bin/bash -e | ||
|
||
rm composer.json | ||
rm -f composer.json | ||
ln -s composer-php7.json composer.json | ||
php composer.phar update |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,23 @@ | ||
#!/bin/bash -e | ||
|
||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
cd $DIR | ||
PHPVERSION=`php -r "echo PHP_MAJOR_VERSION;"` | ||
|
||
|
||
if [ ! -f ./composer.phar ]; then | ||
bash ./composer-setup.sh | ||
fi | ||
|
||
if [ $PHPVERSION = 7 ]; then | ||
bash ./init_env-php7.sh | ||
else | ||
bash ./init_env-php5.6.sh | ||
fi | ||
|
||
echo -e "\n >>>> secure cell tests <<<<\\n" | ||
./vendor/phpunit/phpunit/phpunit scell_test.php | ||
php -c php.ini ./vendor/phpunit/phpunit/phpunit scell_test.php | ||
echo -e "\n >>>> secure message tests <<<<\n" | ||
./vendor/phpunit/phpunit/phpunit smessage_test.php | ||
php -c php.ini ./vendor/phpunit/phpunit/phpunit smessage_test.php | ||
echo -e "\n >>>> secure token tests <<<<\n" | ||
# todo: | ||
./vendor/phpunit/phpunit/phpunit ssession_test.php | ||
php -c php.ini ./vendor/phpunit/phpunit/phpunit ssession_test.php |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shall we return back using "cd -"?