Skip to content

Commit

Permalink
Travis: Disable running tests on OS X
Browse files Browse the repository at this point in the history
  • Loading branch information
hluk committed Apr 4, 2017
1 parent a73258b commit ea75146
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 25 deletions.
24 changes: 0 additions & 24 deletions src/tests/tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1952,10 +1952,6 @@ void Tests::pasteFromMainWindow()

void Tests::tray()
{
#ifdef Q_OS_MAC
SKIP("FIXME: This often fails on Travis CI for OS X.");
#endif

RUN("add" << "A", "");
RUN("menu", "");
waitFor(waitMsShow);
Expand All @@ -1965,10 +1961,6 @@ void Tests::tray()

void Tests::menu()
{
#ifdef Q_OS_MAC
SKIP("FIXME: This often fails on Travis CI for OS X.");
#endif

const auto tab = testTab(1);

RUN("tab" << tab << "add" << "D" << "C" << "B" << "A", "");
Expand All @@ -1987,10 +1979,6 @@ void Tests::menu()

void Tests::traySearch()
{
#ifdef Q_OS_MAC
SKIP("FIXME: This often fails on Travis CI for OS X.");
#endif

RUN("add" << "C" << "B" << "A", "");

RUN("menu", "");
Expand All @@ -2001,10 +1989,6 @@ void Tests::traySearch()

void Tests::configTrayTab()
{
#ifdef Q_OS_MAC
SKIP("FIXME: This often fails on Travis CI for OS X.");
#endif

const auto tab1 = testTab(1);
RUN("tab" << tab1 << "add" << "A", "");

Expand All @@ -2030,10 +2014,6 @@ void Tests::configTrayTab()

void Tests::configMove()
{
#ifdef Q_OS_MAC
SKIP("FIXME: This often fails on Travis CI for OS X.");
#endif

RUN("add" << "B" << "A", "");

RUN("config" << "move" << "true", "true\n");
Expand All @@ -2053,10 +2033,6 @@ void Tests::configMove()

void Tests::configTrayTabIsCurrent()
{
#ifdef Q_OS_MAC
SKIP("FIXME: This often fails on Travis CI for OS X.");
#endif

const auto tab1 = testTab(1);
RUN("tab" << tab1 << "add" << "A", "");

Expand Down
3 changes: 2 additions & 1 deletion utils/travis/script-osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ python macdeployqtfix/macdeployqtfix.py "$executable" /usr/local/Cellar/qt5
"$executable" --info

# Run tests.
"$executable" tests || "$executable" tests
# FIXME: Disabled due to Travis CI ofter randomly failing on GUI and clipboard tests.
#"$executable" tests

# Create "CopyQ.dmg".
"$qt_bin/macdeployqt" CopyQ.app -verbose=2 -dmg -no-plugins
Expand Down

0 comments on commit ea75146

Please sign in to comment.