Skip to content
Permalink
Browse files

Linux travis

  • Loading branch information...
Stefan Eilemann authored and eile committed Sep 12, 2017
1 parent df077e1 commit ba5259d6a1be4c2441c26a51c7c5ec6ac506c47b
@@ -1,9 +1,9 @@
# -*- mode: cmake -*-
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 2635f7f)
git_subproject(Servus https://github.com/HBPVIS/Servus eee5765)
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 867f8d9)
git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git f36655b)
git_subproject(Servus https://github.com/HBPVIS/Servus 132ee50)
git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 41ac72b)
git_subproject(Pression https://github.com/Eyescale/Pression.git 08cd4bf)
git_subproject(hwsd https://github.com/Eyescale/hwsd.git 03b6581)
git_subproject(Collage https://github.com/Eyescale/Collage.git f320324)
git_subproject(Collage https://github.com/Eyescale/Collage.git e2bc13d)
git_subproject(GLStats https://github.com/Eyescale/GLStats.git f9bf19e)
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 0d10736)
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 9373b53)
@@ -2,25 +2,58 @@ notifications:
email:
on_success: never
language: cpp
matrix:
include:
- os: linux
dist: trusty
sudo: required
env: BUILD_TYPE=Debug
- os: linux
dist: trusty
sudo: required
env: BUILD_TYPE=Release
- os: osx
env: BUILD_TYPE=Debug
- os: osx
env: BUILD_TYPE=Release
sudo: false
os:
- osx
env:
global:
- NINJA_STATUS="[%p %u/%t@%o %r]"
- PROJECT_NAME=${PWD##*/}
- TRAVIS=1
- CMAKE_PREFIX_PATH=/usr/local/opt/qt5:$CMAKE_PREFIX_PATH
- LIBJPEGTURBO_ROOT=/usr/local/opt/jpeg-turbo
matrix:
- BUILD_TYPE=Debug
- BUILD_TYPE=Release
addons:
apt:
packages:
- cppcheck
- clang-format-3.8
- doxygen
- ninja-build
- libboost-all-dev
- bison
- flex
- avahi-daemon
- libavahi-client-dev
- libjpeg-turbo8-dev
- libturbojpeg
- qtbase5-dev
- libx11-dev
- libgl1-mesa-dev
- libglewmx1.6-dev
- libspnav-dev
- libopenscenegraph-dev
- libopencv-dev
before_install:
- brew update
- brew outdated cmake || brew upgrade cmake
- brew install cppcheck doxygen ninja jpeg-turbo qt5
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated cmake || brew upgrade cmake; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cppcheck doxygen ninja clang-format jpeg-turbo qt5; fi
script:
- mkdir $BUILD_TYPE
- cd $BUILD_TYPE
- cmake -GNinja -DCLONE_SUBPROJECTS=ON -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
- ninja all && ninja $PROJECT_NAME-tests && ninja install
- find . -name '*.[hc]' -o -name '*.[hci]pp' -o -name '*.frag' -o -name '*.vert' -o -name '*.ispc' -o -name '*.ih' | grep -v 'CMake/common' | xargs clang-format -style=file -fallback-style=none -i
- git diff
- git diff-index --quiet HEAD --
@@ -53,6 +53,7 @@ class Config : public Object
const Layouts& getLayouts() const { return _layouts; }
/** @return the vector of canvases, app-node only. @version 1.0 */
const Canvases& getCanvases() const { return _canvases; }

/**
* @internal
* @return the timeout in ms or LB_TIMEOUT_INDEFINITE for failures.
@@ -17,9 +17,9 @@
*/

#include "wall.h"
#include "vmmlib.h"
#include "pixelViewport.h"
#include "projection.h"
#include "vmmlib.h"

#include <lunchbox/log.h>

@@ -19,10 +19,10 @@
#ifndef EQFABRIC_WALL_H
#define EQFABRIC_WALL_H

#include <iostream>
#include <eq/fabric/api.h>
#include <eq/fabric/types.h>
#include <eq/fabric/vmmlib.h>
#include <iostream>

namespace eq
{
@@ -750,10 +750,6 @@ void Window::joinNVSwapBarrier(const uint32_t group, const uint32_t barrier)
if (group == 0)
return;

#if 1
LBWARN << "Entering untested function GLXWindow::joinNVSwapBarrier"
<< std::endl;

if (!GLXEW_NV_swap_group)
{
LBWARN << "NV Swap group extension not supported" << std::endl;
@@ -798,9 +794,6 @@ void Window::joinNVSwapBarrier(const uint32_t group, const uint32_t barrier)

LBVERB << "Joined swap group " << group << " and barrier " << barrier
<< std::endl;
#else
LBUNIMPLEMENTED;
#endif
}

void Window::leaveNVSwapBarrier()
@@ -110,7 +110,7 @@ class RenderThread : public eq::Worker
bool init() override
{
setName(std::string("Draw") +
boost::lexical_cast<std::string>(_pipe->getPath().pipeIndex));
std::to_string(_pipe->getPath().pipeIndex));
return true;
}

@@ -137,7 +137,7 @@ class TransferThread : public co::Worker
{
if (!co::Worker::init())
return false;
setName(std::string("Tfer") + boost::lexical_cast<std::string>(_index));
setName(std::string("Tfer") + std::to_string(_index));
#ifdef EQ_QT_USED
_qThread = QThread::currentThread();
#endif
@@ -1,7 +1,7 @@

/* Copyright (c) 2007-2011, Stefan Eilemann <eile@equalizergraphics.com>
* 2010, Cedric Stalder <cedric.stalder@gmail.com>
* 2010, Daniel Nachbaur <danielnachbaur@gmail.com>
/* Copyright (c) 2007-2017, Stefan Eilemann <eile@equalizergraphics.com>
* Cedric Stalder <cedric.stalder@gmail.com>
* Daniel Nachbaur <danielnachbaur@gmail.com>
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License version 2.1 as published
@@ -75,7 +75,7 @@ bool startLocalServer(const std::string& config)
{
if (_serverThread.isRunning())
{
LBWARN << "Only one app-local per process server allowed" << std::endl;
LBWARN << "Only one app-local server per process allowed" << std::endl;
return false;
}

@@ -287,8 +287,7 @@ bool Pipe::_configInitWGLEW()
_maxOpenGLVersion = static_cast<float>(atof(glVersion));
}
else
sendError(ERROR_WGLPIPE_WGLEWINIT_FAILED)
<< boost::lexical_cast<std::string>(result);
sendError(ERROR_WGLPIPE_WGLEWINIT_FAILED) << std::to_string(result);

wglDeleteContext(context);
ReleaseDC(hWnd, dc);
@@ -27,8 +27,8 @@
#include <eq/global.h>
#include <eq/pipe.h>

#include <lunchbox/log.h>
#include <lunchbox/debug.h>
#include <lunchbox/log.h>

namespace eq
{
@@ -56,8 +56,8 @@ class Application : public seq::Application
bool run();
virtual bool exit();

virtual seq::Renderer* createRenderer();
virtual co::Object* createObject(const uint32_t type);
seq::Renderer* createRenderer() final;
co::Object* createObject(const uint32_t type) final;

const Model* getModel(const eq::uint128_t& modelID);

@@ -44,6 +44,7 @@ class Renderer : public seq::Renderer
}
virtual ~Renderer() {}
State& getState() { return *_state; }

protected:
virtual bool init(co::Object* initData);
virtual bool exit();
@@ -25,6 +25,20 @@ if(TRAVIS)
client/restart.cpp
sequel/reliabilityOff.cpp
server/reliability.cpp)

if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# Trusty on Travis has problems with anonymous pipe() used by:
set(EXCLUDE_FROM_TESTS
admin/windowCreation.cpp
client/configUpdate.cpp
client/configVisitor.cpp
client/dumpImage.cpp
client/issue270.cpp
client/issue304.cpp
client/restart.cpp
server/reliability.cpp
)
endif()
endif()

set(TEST_LIBRARIES Equalizer EqualizerAdmin EqualizerServer EqualizerFabric

0 comments on commit ba5259d

Please sign in to comment.
You can’t perform that action at this time.