Unit test fixes

examples/triply/typedefs.h

@@ -34,7 +34,7 @@
 #ifndef PLYLIB_TYPEDEFS_H
 #define PLYLIB_TYPEDEFS_H
 
-#if defined(EQ_DEFINES_H) || defined(EQUALIZER_VERSION)
+#ifdef EQUALIZER_USE_OPENGL
 #  define EQUALIZER
 #endif
 
@@ -45,6 +45,7 @@
 #  define PLYLIBWARN    LBWARN
 #  define PLYLIBINFO    LBINFO
 #else
+#  include <GL/glew.h>
 #  include <vmmlib/vmmlib.hpp>
 #  ifdef _WIN32
 #    include <Winsock2.h>
@@ -84,7 +85,7 @@ typedef vmml::vector< 3, float >      Normal;
 typedef vmml::matrix< 4, 4, float >   Matrix4f;
 typedef vmml::vector< 4, float >      Vector4f;
 typedef size_t                        Index;
-typedef GLushort                      ShortIndex;
+typedef unsigned short                ShortIndex;
 
 // mesh exception
 struct MeshException : public std::exception

examples/triply/vertexBufferLeaf.cpp

@@ -112,10 +112,10 @@ const BoundingSphere& VertexBufferLeaf::updateBoundingSphere()
     _boundingSphere.y() = ( _boundingBox[0].y() + _boundingBox[1].y() ) * 0.5f;
     _boundingSphere.z() = ( _boundingBox[0].z() + _boundingBox[1].z() ) * 0.5f;
 
-    _boundingSphere.w()  = LB_MAX( _boundingBox[1].x() - _boundingBox[0].x(),
-                                   _boundingBox[1].y() - _boundingBox[0].y() );
-    _boundingSphere.w()  = LB_MAX( _boundingBox[1].z() - _boundingBox[0].z(),
-                                   _boundingSphere.w() );
+    _boundingSphere.w()  = std::max( _boundingBox[1].x() - _boundingBox[0].x(),
+                                     _boundingBox[1].y() - _boundingBox[0].y());
+    _boundingSphere.w()  = std::max( _boundingBox[1].z() - _boundingBox[0].z(),
+                                     _boundingSphere.w( ));
     _boundingSphere.w() *= .5f;
 
     float  radius        = _boundingSphere.w();

examples/triply/vertexBufferLeaf.h

@@ -40,7 +40,7 @@ class VertexBufferLeaf : public VertexBufferBase
 public:
     explicit VertexBufferLeaf( VertexBufferData& data )
         : _globalData( data ), _vertexStart( 0 ), _indexStart( 0 )
-        , _indexLength( 0 ) {}
+        , _indexLength( 0 ), _vertexLength( 0 ) {}
     virtual ~VertexBufferLeaf() {}
 
     virtual void draw( VertexBufferState& state ) const;

tests/CMakeLists.txt

@@ -4,7 +4,7 @@
 # Change this number when adding tests to force a CMake run: 5
 
 file(GLOB COMPOSITOR_IMAGES compositor/*.rgb)
-file(COPY compressor/images ${PROJECT_SOURCE_DIR}/examples/configs
+file(COPY perf/images ${PROJECT_SOURCE_DIR}/examples/configs
   ${COMPOSITOR_IMAGES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 file(GLOB TEST_CONFIGS server/reliability/*.eqc)

tests/client/configVisitor.cpp

@@ -129,6 +129,7 @@ int main( int argc, char **argv )
         TEST( client->disconnectServer( server ));
         // teardown
         TEST( client->exitLocal( ));
+        lunchbox::sleep( 10 );
     }
 
     eq::exit();

tests/client/issue304.cpp

@@ -25,7 +25,7 @@ int main( const int argc, char** argv )
     eq::Global::setConfigFile( "configs/issue304.eqc" );
 
     eq::NodeFactory nodeFactory;
-    TEST( eq::init( 0, 0, &nodeFactory ));
+    TEST( eq::init( argc, argv, &nodeFactory ));
 
     eq::ClientPtr client = new eq::Client;
     TEST( client->initLocal( argc, argv ));