Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix segfaulting tests #429

Merged
merged 21 commits into from
Aug 22, 2023
Merged

Fix segfaulting tests #429

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c783e48
Break scene3d test apart into component tests
mjcarroll Jun 28, 2022
bce5f0a
Fix include paths
mjcarroll Jun 28, 2022
872a45c
Remove scene3d as it is deprecated
mjcarroll Jun 29, 2022
961f98b
Remove message header
mjcarroll Jun 29, 2022
fbd1b63
Merge branch 'main' into fix_tests
mjcarroll Jun 29, 2022
7403dcc
Merge branch 'main' into fix_tests
mjcarroll Jun 29, 2022
7327d26
Bump everything to ogre2 by default
mjcarroll Jun 29, 2022
03bea7c
Merge branch 'main' into fix_tests
chapulina Jul 23, 2022
cb008b6
line order
chapulina Jul 23, 2022
ef83a9b
Merge branch 'main' into fix_tests
chapulina Aug 5, 2022
8a0133f
Merge branch 'gz-gui7' into fix_tests
chapulina Aug 31, 2022
995a451
Merge branch 'gz-gui7' into fix_tests
azeey Apr 13, 2023
fbfd8a0
Fix tests by delaying get render engine calls (#535)
iche033 Jun 6, 2023
90e94f8
Merge branch 'gz-gui7' into fix_tests
iche033 Jun 6, 2023
44fe63c
revert default engine
iche033 Jun 6, 2023
f9a0964
Merge branch 'gz-gui7' into fix_tests
azeey Jul 24, 2023
e655d40
Merge branch 'gz-gui7' into fix_tests
mjcarroll Aug 15, 2023
bb82bb8
Fix rendering tests (#561)
iche033 Aug 21, 2023
09ac57f
Suppress warnings in metal
mjcarroll Aug 22, 2023
1e67f46
Merge remote-tracking branch 'origin/fix_tests' into fix_tests
mjcarroll Aug 22, 2023
c235101
Incorrect args
mjcarroll Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Helpers_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@ TEST(HelpersTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(renderEngine))
EXPECT_TRUE(renderEngineName().empty());

// Set the render engine GUI name
mainWindow->SetRenderEngine("ogre");
mainWindow->SetRenderEngine("ogre2");

// Has render engine
EXPECT_FALSE(renderEngineName().empty());
EXPECT_EQ("ogre", renderEngineName());
EXPECT_EQ("ogre2", renderEngineName());

// Set no render engine
mainWindow->SetRenderEngine({});
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/minimal_scene/MinimalScene.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ namespace plugins
public: void TextureId(void* _texturePtr);

/// \brief Render engine to use
public: std::string engineName = "ogre";
public: std::string engineName = "ogre2";
mjcarroll marked this conversation as resolved.
Show resolved Hide resolved

/// \brief Unique scene name
public: std::string sceneName = "scene";
Expand Down
4 changes: 2 additions & 2 deletions test/integration/camera_tracking.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
// Load plugins
const char *pluginStr =
"<plugin filename=\"MinimalScene\">"
"<engine>ogre</engine>"
"<engine>ogre2</engine>"
"<scene>banana</scene>"
"<ambient_light>1.0 0 0</ambient_light>"
"<background_color>0 1 0</background_color>"
Expand Down Expand Up @@ -119,7 +119,7 @@ TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
EXPECT_TRUE(poseMsg.has_position());
EXPECT_TRUE(poseMsg.has_orientation());

auto engine = rendering::engine("ogre");
auto engine = rendering::engine("ogre2");
ASSERT_NE(nullptr, engine);

auto scene = engine->SceneByName("banana");
Expand Down
4 changes: 2 additions & 2 deletions test/integration/marker_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ TEST_F(MarkerManagerTestFixture,

const char *pluginMinimalSceneStr =
"<plugin filename=\"MinimalScene\">"
"<engine>ogre</engine>"
"<engine>ogre2</engine>"
"<scene>scene</scene>"
"</plugin>";

Expand Down Expand Up @@ -143,7 +143,7 @@ TEST_F(MarkerManagerTestFixture,
window->QuickWindow()->show();

// Check scene
auto engine = rendering::engine("ogre");
auto engine = rendering::engine("ogre2");
ASSERT_NE(nullptr, engine);

int sleep = 0;
Expand Down
5 changes: 2 additions & 3 deletions test/integration/minimal_scene.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
// Load plugin
const char *pluginStr =
"<plugin filename=\"MinimalScene\">"
"<engine>ogre</engine>"
"<engine>ogre2</engine>"
"<scene>banana</scene>"
"<ambient_light>1.0 0 0</ambient_light>"
"<background_color>0 1 0</background_color>"
Expand Down Expand Up @@ -123,7 +123,7 @@ TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
};

// Check scene
auto engine = rendering::engine("ogre");
auto engine = rendering::engine("ogre2");
ASSERT_NE(nullptr, engine);

int sleep = 0;
Expand Down Expand Up @@ -172,5 +172,4 @@ TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))

win->QuickWindow()->close();
engine->DestroyScene(scene);
EXPECT_TRUE(rendering::unloadEngine(engine->Name()));
}
5 changes: 2 additions & 3 deletions test/integration/transport_scene_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
// Load plugins
const char *pluginStr =
"<plugin filename=\"MinimalScene\">"
"<engine>ogre</engine>"
"<engine>ogre2</engine>"
"<scene>banana</scene>"
"<ambient_light>1.0 0 0</ambient_light>"
"<background_color>0 1 0</background_color>"
Expand Down Expand Up @@ -155,7 +155,7 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
win->QuickWindow()->show();

// Get scene
auto engine = rendering::engine("ogre");
auto engine = rendering::engine("ogre2");
ASSERT_NE(nullptr, engine);

int sleep = 0;
Expand Down Expand Up @@ -261,6 +261,5 @@ TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))

win->QuickWindow()->close();
engine->DestroyScene(scene);
EXPECT_TRUE(rendering::unloadEngine(engine->Name()));
mjcarroll marked this conversation as resolved.
Show resolved Hide resolved
}