-
-
Notifications
You must be signed in to change notification settings - Fork 442
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.
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 XDG tests on Windows #4779
Fix XDG tests on Windows #4779
Conversation
Could we not just ifdef the tests out on Windows? diff --git a/tests/src/XDGDesktopFile.cpp b/tests/src/XDGDesktopFile.cpp
index 171ac9f2..787cb947 100644
--- a/tests/src/XDGDesktopFile.cpp
+++ b/tests/src/XDGDesktopFile.cpp
@@ -5,6 +5,8 @@
using namespace chatterino;
+#if defined(Q_OS_UNIX) and !defined(Q_OS_DARWIN)
+
TEST(XDGDesktopFile, String)
{
auto desktopFile = XDGDesktopFile(":/001-mimeapps.list");
@@ -17,3 +19,5 @@ TEST(XDGDesktopFile, String)
ASSERT_EQ(desktopFile.getEntries("test").size(), 2);
}
+
+#endif
diff --git a/tests/src/XDGHelper.cpp b/tests/src/XDGHelper.cpp
index e142697b..580a45e8 100644
--- a/tests/src/XDGHelper.cpp
+++ b/tests/src/XDGHelper.cpp
@@ -5,6 +5,8 @@
using namespace chatterino;
+#if defined(Q_OS_UNIX) and !defined(Q_OS_DARWIN)
+
TEST(XDGHelper, ParseDesktopExecProgram)
{
struct TestCase {
@@ -60,3 +62,5 @@ TEST(XDGHelper, ParseDesktopExecProgram)
<< output.toStdString() << "'";
}
}
+
+#endif |
09f8a9b
to
c4d8da4
Compare
c4d8da4
to
58d3fc1
Compare
Yes |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Undo the ifdef moves in the src/util/XDG*.*
files, or change the ifdefs of all src/util/XDG*.*
to consistently be
#include ...
#ifdef
namespace chatterino {
...
}
#endif
I can't do that for the |
Description