Skip to content

Commit

Permalink
- make travis happy
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Wieschollek committed Dec 4, 2014
1 parent 7ad417c commit 28e95c0
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 30 deletions.
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
language: cpp
compiler:
- g++

before_install:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
- sudo apt-get update;
- sudo apt-get install gcc-4.8 g++-4.8;
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20;
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 20;
- g++ --version;
- sudo apt-get update -qq;

install:
- make install

script:
- make test
- make main
- ./test
- ./main
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
CppNumericalSolvers (C++11 implementation with MATLAB bindings)
CppNumericalSolvers (C++11 implementation with MATLAB bindings)
=================================================================

[![Build Status](https://api.travis-ci.org/PatWie/CppNumericalSolvers.svg?branch=master)](http://travis-ci.org/PatWie/CppNumericalSolvers)

Quick Intro
-----------
- run `make install` to download and build dependencies
Expand Down
27 changes: 0 additions & 27 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,3 @@ install:
mv eigen-eigen-* eigen
rm -Rf eigen-3.2.2.tar
rm -Rf eigen-3.2.2.tar.bz2



# test: unittests.cpp
# $(CXX) $(CXXFLAGSTEST) -o test Neighborhood.hpp Neighborhood.cpp Vector.hpp Vector.cpp ProQuantization.hpp ProQuantization.cpp ProTree.hpp ProTree.cpp unittests.cpp libgtest.a -lglog
# GLOG_logtostderr=1 ./test

# gtest:
# rm -f gtest-1.7.0.zip
# rm -fR gtest-1.7.0
# wget -O gtest-1.7.0.zip https://googletest.googlecode.com/files/gtest-1.7.0.zip
# unzip gtest-1.7.0.zip
# g++ -Igtest-1.7.0/include -Igtest-1.7.0 -c "gtest-1.7.0/src/gtest-all.cc"
# ar -rv libgtest.a gtest-all.o
# rm -f gtest-1.7.0.zip
# mv gtest-1.7.0 gtest


# cleanall:
# rm -f test
# rm -f main

# cleanmain:
# rm -f main

# cleantest:
# rm -f test
4 changes: 2 additions & 2 deletions src/unittests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ TEST(BfgsTest, RosenbrockNear) { SOLVE_1stOrder(pwie::BfgsSolver, ro
TEST(LbfgsTest, RosenbrockFar) { SOLVE_1stOrder(pwie::LbfgsSolver, rosenbrock, 15.0, 8.0, 0.0) }
TEST(LbfgsTest, RosenbrockNear) { SOLVE_1stOrder(pwie::LbfgsSolver, rosenbrock, 1.0, 3.0, 0.0) }

// TEST(LbfgsbTest, RosenbrockFar) { SOLVE_1stOrder(pwie::LbfgsbSolver, rosenbrock, 15.0, 8.0, 0.0) }
// TEST(LbfgsbTest, RosenbrockNear) { SOLVE_1stOrder(pwie::LbfgsbSolver, rosenbrock, 1.0, 3.0, 0.0) }
TEST(LbfgsbTest, DISABLED_RosenbrockFar) { SOLVE_1stOrder(pwie::LbfgsbSolver, rosenbrock, 15.0, 8.0, 0.0) }
TEST(LbfgsbTest, DISABLED_RosenbrockNear) { SOLVE_1stOrder(pwie::LbfgsbSolver, rosenbrock, 1.0, 3.0, 0.0) }

int main (int argc, char **argv)
{
Expand Down

0 comments on commit 28e95c0

Please sign in to comment.