Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
a4fbe356
Commit
a4fbe356
authored
Mar 18, 2019
by
Davis King
Browse files
Try some os x tests on travis again.
parent
76a65c77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
21 deletions
+21
-21
.travis.yml
.travis.yml
+19
-19
dlib/travis/build-and-test.sh
dlib/travis/build-and-test.sh
+2
-2
No files found.
.travis.yml
View file @
a4fbe356
...
@@ -106,23 +106,23 @@ matrix:
...
@@ -106,23 +106,23 @@ matrix:
-
dlib/travis/build-and-test.sh
-
dlib/travis/build-and-test.sh
###################
###################
# # Disabled because travis's OS X machines take hours (or days) to begin
-
language
:
cpp
# running. Or maybe they are just broken entirely. Who knows.
os
:
osx
#- language: cpp
osx_image
:
xcode9.2
# os: osx
env
:
# osx_image: xcode9.2
-
VARIANT=test
# env:
# Don't test the timer because it relies on the machine running it not
# - VARIANT=test
# being under high load, but that seems to be unlikely on the travis
# script:
# osx VMs.
# - dlib/travis/build-and-test.sh
-
DISABLED_TESTS="--no_test_timer"
script
:
-
dlib/travis/build-and-test.sh
###################
###################
#- language: python
-
language
:
cpp
# os: osx
os
:
osx
# osx_image: xcode9.2
osx_image
:
xcode9.2
# python: 3.5
env
:
# env:
-
VARIANT=python-api
# - VARIANT=python-api
script
:
# script:
-
dlib/travis/build-and-test.sh
# - dlib/travis/build-and-test.sh
dlib/travis/build-and-test.sh
View file @
a4fbe356
...
@@ -13,7 +13,7 @@ if [ "$VARIANT" = "test" ]; then
...
@@ -13,7 +13,7 @@ if [ "$VARIANT" = "test" ]; then
cd
build
cd
build
cmake ../dlib/test
cmake ../dlib/test
cmake
--build
.
--target
dtest
--
-j
2
cmake
--build
.
--target
dtest
--
-j
2
./dtest
--runall
./dtest
--runall
$DISABLED_TESTS
fi
fi
# build dlib and tests
# build dlib and tests
...
@@ -22,7 +22,7 @@ if [ "$VARIANT" = "test-debug" ]; then
...
@@ -22,7 +22,7 @@ if [ "$VARIANT" = "test-debug" ]; then
cd
build
cd
build
cmake ../dlib/test
-DDLIB_ENABLE_ASSERTS
=
1
cmake ../dlib/test
-DDLIB_ENABLE_ASSERTS
=
1
cmake
--build
.
--target
dtest
--
-j
2
cmake
--build
.
--target
dtest
--
-j
2
./dtest
--runall
./dtest
--runall
$DISABLED_TESTS
fi
fi
if
[
"
$VARIANT
"
=
"dlib_all_source_cpp"
]
;
then
if
[
"
$VARIANT
"
=
"dlib_all_source_cpp"
]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment