Merge pull request #47 from hmartiro/feature/travis-ci

Feature/travis ci

Merge pull request #47 from hmartiro/feature/travis-ci
Feature/travis ci
Hayk Martirosyan · GitHub
2 parents 74bf7b49 9f6d5096
Showing 6 changed files with 51 additions and 3 deletions
.travis.yml
CMakeLists.txt
README.md
make-ci.sh
make.sh
test/test.cpp
+# Enable C++ support
+language: cpp
+# OS
+sudo: required
+dist: trusty
+# Compiler selection
+compiler:
+  - clang
+  - gcc
+# Build steps
+script: ./make-ci.sh
@@ -108,7 +108,7 @@ if (tests)
   add_executable(test_redox test/test.cpp)
  
   target_include_directories(test_redox PUBLIC ${GTEST_INCLUDE_DIRS})
-  target_link_libraries(test_redox redox gtest)
+  target_link_libraries(test_redox redox ${GTEST_BOTH_LIBRARIES})
  
   # So that we can run 'make test'
   add_test(test_redox test_redox)
@@ -149,7 +149,7 @@ if (examples)
  
   add_executable(binary_data_publish examples/binary_data_publish.cpp)
   target_link_libraries(binary_data_publish redox)
-  
+
   add_executable(pub_sub examples/pub_sub.cpp)
   target_link_libraries(pub_sub redox)
  
@@ -2,6 +2,8 @@ redox
 ======
  
 Modern, asynchronous, and wicked fast C++11 client for Redis
+[![Build Status](https://travis-ci.org/hmartiro/redox.svg?branch=feature%2Ftravis-ci)]
+(https://travis-ci.org/hmartiro/redox)
  
 Redox is a C++ interface to the
 [Redis](http://redis.io/) key-value store that makes it easy to write applications
+#!/usr/bin/env bash
+# Build script for continuous integration
+set -ev
+env | sort
+
+# Install packages
+sudo apt-get update
+sudo apt-get install -y libhiredis-dev libev-dev libgtest-dev redis-server
+
+# Clean
+rm -rf build
+mkdir build
+cd build
+
+# Make gtest
+git clone https://github.com/google/googletest
+cd googletest
+mkdir build
+cd build
+cmake -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON -DBUILD_SHARED_LIBS=ON ..
+time make
+cd ../..
+sudo cp googletest/build/googletest/libg* /usr/local/lib/
+sudo cp -r googletest/googletest/include/gtest /usr/local/include
+
+# Make redox
+cmake -Dexamples=ON -Dlib=ON -Dstatic_lib=ON -Dtests=ON ..
+time make VERBOSE=1
+
+# Test redox
+sudo service redis-server restart
+./test_redox
+cd ..
+#!/usr/bin/env bash
 mkdir -p build &&
 cd build &&
 cmake ..  &&
@@ -20,8 +20,9 @@
  
 #include <iostream>
  
+#include <gtest/gtest.h>
+
 #include "redox.hpp"
-#include "gtest/gtest.h"
  
 namespace {