Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenSK
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
koenigl2
OpenSK
Commits
95a8fe7d
Commit
95a8fe7d
authored
5 years ago
by
Jean-Michel Picod
Browse files
Options
Downloads
Patches
Plain Diff
Enable Travis on OSX
Only do the build/link check. The unit tests are only ran on linux.
parent
f5ed8a09
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+1
-0
1 addition, 0 deletions
.travis.yml
run_desktop_tests.sh
+24
-32
24 additions, 32 deletions
run_desktop_tests.sh
with
25 additions
and
32 deletions
.travis.yml
+
1
−
0
View file @
95a8fe7d
...
@@ -18,6 +18,7 @@ rust:
...
@@ -18,6 +18,7 @@ rust:
os
:
os
:
-
linux
-
linux
-
osx
addons
:
addons
:
apt
:
apt
:
...
...
This diff is collapsed.
Click to expand it.
run_desktop_tests.sh
+
24
−
32
View file @
95a8fe7d
...
@@ -13,17 +13,7 @@
...
@@ -13,17 +13,7 @@
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
set
-eu
set
-eux
# Ensure we have the key_material.rs file before running the tests
if
[
!
-f
src/ctap/key_material.rs
]
then
echo
"
$(
tput bold
)
ERROR:
$(
tput sgr0
)
Cannot find src/ctap/key_material.rs file."
echo
"Please make sure that you have run the following script: ./setup.sh"
exit
2
fi
set
-x
echo
"Checking formatting..."
echo
"Checking formatting..."
cargo
fmt
--all
--
--check
cargo
fmt
--all
--
--check
...
@@ -46,27 +36,29 @@ cargo check --release --target=thumbv7em-none-eabi --examples
...
@@ -46,27 +36,29 @@ cargo check --release --target=thumbv7em-none-eabi --examples
echo
"Checking that CTAP2 builds and links properly (1 set of features)..."
echo
"Checking that CTAP2 builds and links properly (1 set of features)..."
cargo build
--release
--target
=
thumbv7em-none-eabi
--features
with_ctap1
cargo build
--release
--target
=
thumbv7em-none-eabi
--features
with_ctap1
echo
"Running unit tests on the desktop (release mode)..."
if
[
"
${
TRAVIS_OS_NAME
}
"
=
"linux"
]
cd
libraries/cbor
then
cargo
test
--release
--features
std
echo
"Running unit tests on the desktop (release mode)..."
cd
../..
cd
libraries/cbor
cd
libraries/crypto
cargo
test
--release
--features
std
RUSTFLAGS
=
'-C target-feature=+aes'
cargo
test
--release
--features
std,derive_debug
cd
../..
cd
../..
cd
libraries/crypto
cargo
test
--release
--features
std
RUSTFLAGS
=
'-C target-feature=+aes'
cargo
test
--release
--features
std,derive_debug
cd
../..
echo
"Running unit tests on the desktop (debug mode)..."
cargo
test
--release
--features
std
cd
libraries/cbor
cargo
test
--features
std
cd
../..
cd
libraries/crypto
RUSTFLAGS
=
'-C target-feature=+aes'
cargo
test
--features
std,derive_debug
cd
../..
cargo
test
--features
std
echo
"Running unit tests on the desktop (release mode + CTAP1)..."
echo
"Running unit tests on the desktop (debug mode)..."
cargo
test
--release
--features
std,with_ctap1
cd
libraries/cbor
cargo
test
--features
std
cd
../..
cd
libraries/crypto
RUSTFLAGS
=
'-C target-feature=+aes'
cargo
test
--features
std,derive_debug
cd
../..
cargo
test
--features
std
echo
"Running unit tests on the desktop (
debug
mode + CTAP1)..."
echo
"Running unit tests on the desktop (
release
mode + CTAP1)..."
cargo
test
--features
std,with_ctap1
cargo
test
--release
--features
std,with_ctap1
echo
"Running unit tests on the desktop (debug mode + CTAP1)..."
cargo
test
--features
std,with_ctap1
fi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment