Commit b61b1296 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed vectorfield module CMake file.

Fixed test-campvis on Linux.
parent 7d241eea
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
IF(${ModuleEnabled}) IF(${ModuleEnabled})
# Source files: # Source files:
FILE(GLOB ThisModSources RELATIVE ${ModulesDir} FILE(GLOB ThisModSources RELATIVE ${ModulesDir}
modules/vectorfield/*.cpp
modules/vectorfield/processors/*.cpp modules/vectorfield/processors/*.cpp
modules/vectorfield/pipelines/*.cpp modules/vectorfield/pipelines/*.cpp
) )
......
...@@ -87,15 +87,16 @@ GTEST_API_ int main(int argc, char **argv) { ...@@ -87,15 +87,16 @@ GTEST_API_ int main(int argc, char **argv) {
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
init(); init();
int ret; int ret;
std::thread testThread([&] () { std::thread testThread([&] () {
cgt::GLContextScopedLock lock(_localContext); cgt::GLContextScopedLock lock(_localContext);
ret= RUN_ALL_TESTS(); ret= RUN_ALL_TESTS();
app->exit();
}); });
app->exec(); app->exec();
testThread.join();
app->exit();
deinit(); deinit();
delete app; delete app;
......
...@@ -98,6 +98,9 @@ protected: ...@@ -98,6 +98,9 @@ protected:
processors[i]->invalidate(AbstractProcessor::INVALID_RESULT); processors[i]->invalidate(AbstractProcessor::INVALID_RESULT);
} }
} }
else {
FAIL() << "Could not instantiate pipeline '" << _pipelineName << "'";
}
} }
void execute() { void execute() {
...@@ -211,3 +214,4 @@ TEST_F(PipelineWriteResultImageTest, TensorDemo) { ...@@ -211,3 +214,4 @@ TEST_F(PipelineWriteResultImageTest, TensorDemo) {
} }
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment