mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove GCC warnings

Browse Source 
Only use 2 threads for multithreaded compilation on Jenkins in Windows
This commit is contained in:
Alexander Bock
2017-07-01 14:00:29 -04:00
parent 4318a2b709
commit 6401f691b9
4 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -49,7 +49,7 @@ stage('Build') {
cd build
cmake -G "Visual Studio 14 2015 Win64" .. ''' +
flags + ''' ..
msbuild.exe OpenSpace.sln /m:8 /p:Configuration=Debug
msbuild.exe OpenSpace.sln /m:2 /p:Configuration=Debug
'''
}
}
ext/ghoul
+1 -1
Submodule ext/ghoul updated: bcb1732e7a...b1ee754001
tests/test_luaconversions.inl
+48 -48
View File
@@ -64,7 +64,7 @@ TEST_F(LuaConversionTest, LuaExecution) {
= PropertyDelegate<TemplateProperty<__TYPE__>>::toLuaValue<__TYPE__>( \
state, __VALUE__); \
EXPECT_TRUE(success) << "toLuaValue"; \
__TYPE__ value = (__TYPE__)(0); \
__TYPE__ value = static_cast<__TYPE__>(0); \
value = PropertyDelegate<TemplateProperty<__TYPE__>>::fromLuaValue<__TYPE__>( \
state, success); \
EXPECT_TRUE(success) << "fromLuaValue"; \
@@ -79,62 +79,62 @@ TEST_F(LuaConversionTest, LuaExecution) {
= PropertyDelegate<NumericalProperty<__TYPE__>>::toLuaValue<__TYPE__>( \
state, __VALUE__); \
EXPECT_TRUE(success) << "toLuaValue"; \
__TYPE__ value = (__TYPE__)(0); \
__TYPE__ value = static_cast<__TYPE__>(0); \
value = PropertyDelegate<NumericalProperty<__TYPE__>>::fromLuaValue<__TYPE__>( \
state, success); \
EXPECT_TRUE(success) << "fromLuaValue"; \
EXPECT_EQ(value, __VALUE__) << "fromLuaValue"; \
}
CONVERSION_TEST_TEMPLATE(Bool, bool, true);
CONVERSION_TEST_TEMPLATE(Bool, bool, true)
CONVERSION_TEST_NUMERICAL(Char, char, 1);
CONVERSION_TEST_NUMERICAL(Char, char, 1)
//CONVERSION_TEST_NUMERICAL(WChar, wchar_t, 1);
CONVERSION_TEST_NUMERICAL(SignedChar, signed char, 1);
CONVERSION_TEST_NUMERICAL(UnsignedChar, unsigned char, 1);
CONVERSION_TEST_NUMERICAL(Short, short, 1);
CONVERSION_TEST_NUMERICAL(UnsignedShort, unsigned short, 1);
CONVERSION_TEST_NUMERICAL(Int, int, 1);
CONVERSION_TEST_NUMERICAL(UnsignedInt, unsigned int, 1);
CONVERSION_TEST_NUMERICAL(Long, long, 1);
CONVERSION_TEST_NUMERICAL(UnsignedLong, unsigned long, 1);
CONVERSION_TEST_NUMERICAL(LongLong, long long, 1);
CONVERSION_TEST_NUMERICAL(UnsignedLongLong, unsigned long long, 1);
CONVERSION_TEST_NUMERICAL(Float, float, 1.f);
CONVERSION_TEST_NUMERICAL(Double, double, 1.0);
CONVERSION_TEST_NUMERICAL(LongDouble, long double, 1.0);
CONVERSION_TEST_NUMERICAL(SignedChar, signed char, 1)
CONVERSION_TEST_NUMERICAL(UnsignedChar, unsigned char, 1)
CONVERSION_TEST_NUMERICAL(Short, short, 1)
CONVERSION_TEST_NUMERICAL(UnsignedShort, unsigned short, 1)
CONVERSION_TEST_NUMERICAL(Int, int, 1)
CONVERSION_TEST_NUMERICAL(UnsignedInt, unsigned int, 1)
CONVERSION_TEST_NUMERICAL(Long, long, 1)
CONVERSION_TEST_NUMERICAL(UnsignedLong, unsigned long, 1)
CONVERSION_TEST_NUMERICAL(LongLong, long long, 1)
CONVERSION_TEST_NUMERICAL(UnsignedLongLong, unsigned long long, 1)
CONVERSION_TEST_NUMERICAL(Float, float, 1.f)
CONVERSION_TEST_NUMERICAL(Double, double, 1.0)
CONVERSION_TEST_NUMERICAL(LongDouble, long double, 1.0)
CONVERSION_TEST_NUMERICAL(Vec2, glm::vec2, glm::vec2(1.f));
CONVERSION_TEST_NUMERICAL(Vec3, glm::vec3, glm::vec3(1.f));
CONVERSION_TEST_NUMERICAL(Vec4, glm::vec4, glm::vec4(1.f));
CONVERSION_TEST_NUMERICAL(DVec2, glm::dvec2, glm::dvec2(1.0));
CONVERSION_TEST_NUMERICAL(DVec3, glm::dvec3, glm::dvec3(1.0));
CONVERSION_TEST_NUMERICAL(DVec4, glm::dvec4, glm::dvec4(1.0));
CONVERSION_TEST_NUMERICAL(IVec2, glm::ivec2, glm::ivec2(1));
CONVERSION_TEST_NUMERICAL(IVec3, glm::ivec3, glm::ivec3(1));
CONVERSION_TEST_NUMERICAL(IVec4, glm::ivec4, glm::ivec4(1));
CONVERSION_TEST_NUMERICAL(UVec2, glm::uvec2, glm::uvec2(1));
CONVERSION_TEST_NUMERICAL(UVec3, glm::uvec3, glm::uvec3(1));
CONVERSION_TEST_NUMERICAL(UVec4, glm::uvec4, glm::uvec4(1));
CONVERSION_TEST_NUMERICAL(Vec2, glm::vec2, glm::vec2(1.f))
CONVERSION_TEST_NUMERICAL(Vec3, glm::vec3, glm::vec3(1.f))
CONVERSION_TEST_NUMERICAL(Vec4, glm::vec4, glm::vec4(1.f))
CONVERSION_TEST_NUMERICAL(DVec2, glm::dvec2, glm::dvec2(1.0))
CONVERSION_TEST_NUMERICAL(DVec3, glm::dvec3, glm::dvec3(1.0))
CONVERSION_TEST_NUMERICAL(DVec4, glm::dvec4, glm::dvec4(1.0))
CONVERSION_TEST_NUMERICAL(IVec2, glm::ivec2, glm::ivec2(1))
CONVERSION_TEST_NUMERICAL(IVec3, glm::ivec3, glm::ivec3(1))
CONVERSION_TEST_NUMERICAL(IVec4, glm::ivec4, glm::ivec4(1))
CONVERSION_TEST_NUMERICAL(UVec2, glm::uvec2, glm::uvec2(1))
CONVERSION_TEST_NUMERICAL(UVec3, glm::uvec3, glm::uvec3(1))
CONVERSION_TEST_NUMERICAL(UVec4, glm::uvec4, glm::uvec4(1))
CONVERSION_TEST_NUMERICAL(Mat2x2, glm::mat2x2, glm::mat2x2(1.f));
CONVERSION_TEST_NUMERICAL(Mat2x3, glm::mat2x3, glm::mat2x3(1.f));
CONVERSION_TEST_NUMERICAL(Mat2x4, glm::mat2x4, glm::mat2x4(1.f));
CONVERSION_TEST_NUMERICAL(Mat3x2, glm::mat3x2, glm::mat3x2(1.f));
CONVERSION_TEST_NUMERICAL(Mat3x3, glm::mat3x3, glm::mat3x3(1.f));
CONVERSION_TEST_NUMERICAL(Mat3x4, glm::mat3x4, glm::mat3x4(1.f));
CONVERSION_TEST_NUMERICAL(Mat4x2, glm::mat4x2, glm::mat4x2(1.f));
CONVERSION_TEST_NUMERICAL(Mat4x3, glm::mat4x3, glm::mat4x3(1.f));
CONVERSION_TEST_NUMERICAL(Mat4x4, glm::mat4x4, glm::mat4x4(1.f));
CONVERSION_TEST_NUMERICAL(DMat2x2, glm::dmat2x2, glm::dmat2x2(1.f));
CONVERSION_TEST_NUMERICAL(DMat2x3, glm::dmat2x3, glm::dmat2x3(1.f));
CONVERSION_TEST_NUMERICAL(DMat2x4, glm::dmat2x4, glm::dmat2x4(1.f));
CONVERSION_TEST_NUMERICAL(DMat3x2, glm::dmat3x2, glm::dmat3x2(1.f));
CONVERSION_TEST_NUMERICAL(DMat3x3, glm::dmat3x3, glm::dmat3x3(1.f));
CONVERSION_TEST_NUMERICAL(DMat3x4, glm::dmat3x4, glm::dmat3x4(1.f));
CONVERSION_TEST_NUMERICAL(DMat4x2, glm::dmat4x2, glm::dmat4x2(1.f));
CONVERSION_TEST_NUMERICAL(DMat4x3, glm::dmat4x3, glm::dmat4x3(1.f));
CONVERSION_TEST_NUMERICAL(DMat4x4, glm::dmat4x4, glm::dmat4x4(1.f));
CONVERSION_TEST_NUMERICAL(Mat2x2, glm::mat2x2, glm::mat2x2(1.f))
CONVERSION_TEST_NUMERICAL(Mat2x3, glm::mat2x3, glm::mat2x3(1.f))
CONVERSION_TEST_NUMERICAL(Mat2x4, glm::mat2x4, glm::mat2x4(1.f))
CONVERSION_TEST_NUMERICAL(Mat3x2, glm::mat3x2, glm::mat3x2(1.f))
CONVERSION_TEST_NUMERICAL(Mat3x3, glm::mat3x3, glm::mat3x3(1.f))
CONVERSION_TEST_NUMERICAL(Mat3x4, glm::mat3x4, glm::mat3x4(1.f))
CONVERSION_TEST_NUMERICAL(Mat4x2, glm::mat4x2, glm::mat4x2(1.f))
CONVERSION_TEST_NUMERICAL(Mat4x3, glm::mat4x3, glm::mat4x3(1.f))
CONVERSION_TEST_NUMERICAL(Mat4x4, glm::mat4x4, glm::mat4x4(1.f))
CONVERSION_TEST_NUMERICAL(DMat2x2, glm::dmat2x2, glm::dmat2x2(1.f))
CONVERSION_TEST_NUMERICAL(DMat2x3, glm::dmat2x3, glm::dmat2x3(1.f))
CONVERSION_TEST_NUMERICAL(DMat2x4, glm::dmat2x4, glm::dmat2x4(1.f))
CONVERSION_TEST_NUMERICAL(DMat3x2, glm::dmat3x2, glm::dmat3x2(1.f))
CONVERSION_TEST_NUMERICAL(DMat3x3, glm::dmat3x3, glm::dmat3x3(1.f))
CONVERSION_TEST_NUMERICAL(DMat3x4, glm::dmat3x4, glm::dmat3x4(1.f))
CONVERSION_TEST_NUMERICAL(DMat4x2, glm::dmat4x2, glm::dmat4x2(1.f))
CONVERSION_TEST_NUMERICAL(DMat4x3, glm::dmat4x3, glm::dmat4x3(1.f))
CONVERSION_TEST_NUMERICAL(DMat4x4, glm::dmat4x4, glm::dmat4x4(1.f))
TEST_F(LuaConversionTest, String)
{
@@ -148,4 +148,4 @@ TEST_F(LuaConversionTest, String)
state, success);
EXPECT_TRUE(success) << "fromLuaValue";
EXPECT_EQ(value, "value") << "fromLuaValue";
}
}
tests/test_spicemanager.inl
+2 -2
View File
@@ -451,8 +451,8 @@ TEST_F(SpiceManagerTest, getFieldOfView) {
ASSERT_TRUE(found == SPICETRUE);
//check vectors have correct values
for (int i = 0; i < res.bounds.size(); i++){
for (int j = 0; j < 3; j++){
for (size_t i = 0; i < res.bounds.size(); i++) {
for (size_t j = 0; j < 3; j++) {
EXPECT_DOUBLE_EQ(bounds_ref[i][j], res.bounds[i][j]) << "One or more Field of View Boundary vectors \
differ from expected output";
}