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

Revert the previous change in 250681196f #53

Merged
merged 3 commits into from
Nov 20, 2016
Merged

Revert the previous change in 250681196f #53

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
20b1f08
Revert the previous change in 250681196f
aparent Nov 14, 2016
4c3ec16
Remove -E option from find.
aparent Nov 16, 2016
96ff4c2
Write the name of the test which was was passed.
aparent Nov 17, 2016
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
4 changes: 3 additions & 1 deletion .travis-banned-functions-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

retvalue=0

if [[ $(find -E . -name '*.[ch]' -exec grep -H bzero {} \;) ]];
if [[ $(find . -name '*.[ch]' -exec grep -H bzero {} \;) ]];
then
tput setaf 1;
echo "Code uses banned functions (bzero).";
tput sgr 0
retvalue=1;
fi;

Expand All @@ -15,6 +16,7 @@ if [[ $retvalue == 0 ]];
then
tput setaf 2;
echo "Code does not use banned functions.";
tput sgr 0
fi;

exit $retvalue;
4 changes: 3 additions & 1 deletion .travis-global-namespace-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ if [[ $(nm -g liboqs.a | grep ' T ' | grep -E -v -i ' T [_]?OQS') ]];
then
tput setaf 1;
echo "Code contains the following non-namespaced global symbols; see https://github.com/open-quantum-safe/liboqs/wiki/Coding-conventions for function naming conventions.";
tput sgr 0
nm -g liboqs.a | grep ' T ' | grep -E -v -i ' T [_]?OQS'
exit 1;
else
tput setaf 2;
echo "Code adheres to the project standards.";
echo "Code adheres to the project standards (global namespace).";
tput sgr 0
exit 0;
fi;
15 changes: 12 additions & 3 deletions .travis-style-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
#!/bin/bash

if [[ $(make prettyprint | grep Formatted) ]];
then
make prettyprint | grep -q Formatted
STATUS=(${PIPESTATUS[*]})

if [ ${STATUS[1]} == 0 ]; then
tput setaf 1;
echo "Code does not adhere to the project standards. Run \"make prettyprint\".";
tput sgr 0;
exit 1;
elif [ ${STATUS[0]} != 0 ]; then
tput setaf 1;
echo "prettyprint failed.";
tput sgr 0;
exit 1;
else
tput setaf 2;
echo "Code adheres to the project standards.";
echo "Code adheres to the project standards (prettyprint).";
tput sgr 0;
exit 0;
fi;
20 changes: 16 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
- astyle
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- os: linux
compiler: gcc
env: CC_OQS=gcc-4.9
Expand All @@ -22,7 +25,10 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-4.9
- astyle
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- os: linux
compiler: gcc
env: CC_OQS=gcc-5
Expand All @@ -32,7 +38,10 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-5
- astyle
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- os: linux
compiler: gcc
env: CC_OQS=gcc-6 USE_OPENSSL=1
Expand All @@ -42,8 +51,11 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- gcc-6
- astyle
- libssl-dev
before_install:
- wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz
- tar xzf astyle_2.05.1_linux.tar.gz
- cd astyle/build/gcc && make && export PATH=$(pwd)/bin:$PATH && cd ../../../
- os: osx
compiler: clang
env: CC_OQS=clang AES_NI=0 USE_OPENSSL=1
Expand Down