"examples/git@developer.sourcefind.cn:OpenDAS/ollama.git" did not exist on "23e1da778ddcb2a217fa965435d44df1d09cf4b2"
Commit a41b3d7c authored by Davis King's avatar Davis King
Browse files

We have some excessive and duplicative tests in the travis-ci setup.

This is causing us to run out of travis-ci credits, making tests not run
at all.  I deleted the duplicative tests and then disabled two additonal
ones by commenting them out that would be nice to run but I think are
not essential.  In particular, the OSX one eats up a ton of credits.  So
I disabled that.  Maybe we can turn it back on later if we end up well
under the credit budget (or switch to github actions which appears to
have higher limits)
parent 2e8bac19
...@@ -12,15 +12,6 @@ matrix: ...@@ -12,15 +12,6 @@ matrix:
script: script:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
###################
- language: cpp
compiler: clang
os: linux
env:
- VARIANT=examples-debug
script:
- dlib/travis/build-and-test.sh
################### ###################
- language: cpp - language: cpp
compiler: gcc compiler: gcc
...@@ -31,15 +22,6 @@ matrix: ...@@ -31,15 +22,6 @@ matrix:
script: script:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
###################
- language: cpp
compiler: gcc
os: linux
env:
- VARIANT=tools
script:
- dlib/travis/build-and-test.sh
################### ###################
- language: cpp - language: cpp
compiler: gcc compiler: gcc
...@@ -53,15 +35,6 @@ matrix: ...@@ -53,15 +35,6 @@ matrix:
script: script:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
###################
- language: cpp
compiler: gcc
os: linux
env:
- VARIANT=dlib_all_source_cpp
script:
- dlib/travis/build-and-test.sh
########### test with C++17 ######## ########### test with C++17 ########
- language: cpp - language: cpp
compiler: gcc compiler: gcc
...@@ -84,21 +57,13 @@ matrix: ...@@ -84,21 +57,13 @@ matrix:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
################### ###################
- language: cpp # Disabled to avoid spending too many travis-ci credits each month.
compiler: gcc #- language: python
os: linux # python: 3.5
env: # env:
- VARIANT=examples # - VARIANT=python-api
script: # script:
- dlib/travis/build-and-test.sh # - dlib/travis/build-and-test.sh
###################
- language: python
python: 3.5
env:
- VARIANT=python-api
script:
- dlib/travis/build-and-test.sh
################### ###################
- language: python - language: python
...@@ -109,15 +74,17 @@ matrix: ...@@ -109,15 +74,17 @@ matrix:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
################### ###################
- language: cpp # Disabled to avoid spending too many travis-ci credits each month. They
os: osx # also charge 5x as many credits for osx as linux.
osx_image: xcode9.2 #- language: cpp
env: # os: osx
- VARIANT=test # osx_image: xcode9.2
# Don't test the timer because it relies on the machine running it not # env:
# being under high load, but that seems to be unlikely on the travis # - VARIANT=test
# osx VMs. # # Don't test the timer because it relies on the machine running it not
- DISABLED_TESTS="--no_test_timer" # # 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
...@@ -30,20 +30,6 @@ if [ "$VARIANT" = "test-debug" ]; then ...@@ -30,20 +30,6 @@ if [ "$VARIANT" = "test-debug" ]; then
./dtest --runall $DISABLED_TESTS ./dtest --runall $DISABLED_TESTS
fi fi
if [ "$VARIANT" = "dlib_all_source_cpp" ]; then
mkdir build
cd build
cmake ../dlib/test -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . --target dlib_all_source_cpp -- -j 2
fi
if [ "$VARIANT" = "tools" ]; then
mkdir build
cd build
cmake ../dlib/test/tools -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . -- -j 2
fi
# The point of this test is just to make sure the cmake scripts work with the # The point of this test is just to make sure the cmake scripts work with the
# oldest version of cmake we are supposed to support. # oldest version of cmake we are supposed to support.
if [ "$VARIANT" = "old-cmake" ]; then if [ "$VARIANT" = "old-cmake" ]; then
...@@ -69,20 +55,6 @@ if [ "$VARIANT" = "old-cmake" ]; then ...@@ -69,20 +55,6 @@ if [ "$VARIANT" = "old-cmake" ]; then
$CMAKEDIR/2.8/bin/cmake --build . -- -j 2 $CMAKEDIR/2.8/bin/cmake --build . -- -j 2
fi fi
if [ "$VARIANT" = "examples" ]; then
mkdir build
cd build
cmake ../examples -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . -- -j 1
fi
if [ "$VARIANT" = "examples-debug" ]; then
mkdir build
cd build
cmake ../examples -DDLIB_ENABLE_ASSERTS=1 -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
cmake --build . -- -j 1
fi
if [ "$VARIANT" = "python-api" ]; then if [ "$VARIANT" = "python-api" ]; then
python setup.py test --clean python setup.py test --clean
pip uninstall numpy -y pip uninstall numpy -y
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment