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

Jump to bottom

Add Ubuntu Jammy CI #374

Merged
merged 2 commits into from
Mar 30, 2022
Merged

Add Ubuntu Jammy CI #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20b004
Add Ubuntu Jammy CI
scpeters Mar 22, 2022
52fd916
Fix tests
chapulina Mar 30, 2022
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
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@ jobs:
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@focal
jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@jammy
5 changes: 4 additions & 1 deletion src/Helpers_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
#include "ignition/gui/Helpers.hh"

int gg_argc = 1;
char **gg_argv = new char *[gg_argc];
char* gg_argv[] =
{
reinterpret_cast<char*>(const_cast<char*>("./Helpers_TEST")),
};

using namespace ignition;
using namespace gui;
Expand Down
6 changes: 4 additions & 2 deletions src/MainWindow_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,8 @@ void FindExitDialogButtons(
QObject *buttonBox{nullptr};
for (const auto& c : dialog->findChildren<QObject *>())
{
if (c->metaObject()->className() == std::string("QQuickDialogButtonBox"))
if (std::string(c->metaObject()->className()).find("ButtonBox") !=
std::string::npos)
{
const auto& p = c->property("standardButtons");
if (p.isValid() && p.toInt() != 0)
Expand All @@ -543,7 +544,8 @@ void FindExitDialogButtons(
Q_RETURN_ARG(QQuickItem *, button),
Q_ARG(int, index));

ASSERT_STREQ("QQuickButton", button->metaObject()->className());
ASSERT_NE(std::string::npos,
std::string(button->metaObject()->className()).find("Button"));
buttons.push_back(button);
}

Expand Down
5 changes: 4 additions & 1 deletion test/integration/minimal_scene.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
#include "ignition/gui/MainWindow.hh"

int g_argc = 1;
char **g_argv = new char *[g_argc];
char* g_argv[] =
{
reinterpret_cast<char*>(const_cast<char*>("./MinimalScene_TEST")),
};

using namespace ignition;
using namespace gui;
Expand Down
9 changes: 6 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 @@ -37,13 +37,16 @@
#include "ignition/gui/MainWindow.hh"

int g_argc = 1;
char **g_argv = new char *[g_argc];
char* g_argv[] =
{
reinterpret_cast<char*>(const_cast<char*>("./TransportSceneManager_TEST")),
};

using namespace ignition;
using namespace gui;

/////////////////////////////////////////////////
TEST(MinimalSceneTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
TEST(TransportSceneManagerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
{
common::Console::SetVerbosity(4);

Expand Down Expand Up @@ -77,7 +80,7 @@ TEST(MinimalSceneTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
}

/////////////////////////////////////////////////
TEST(MinimalSceneTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
TEST(TransportSceneManagerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config))
{
bool sceneRequested{false};
std::function<bool(msgs::Scene &)> sceneService =
Expand Down