Skip to content

Commit

Permalink
Travis: Run test on OS X
Browse files Browse the repository at this point in the history
  • Loading branch information
hluk committed Feb 25, 2017
1 parent 2fe8d1b commit 17c8456
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
14 changes: 14 additions & 0 deletions src/tests/tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1082,9 +1082,15 @@ void Tests::classTemporaryFile()

void Tests::keysAndFocusing()
{
#ifdef Q_OS_MAC
SKIP("FIXME: New tab dialog has either incorrect title or is not focused on OS X");
#endif

RUN("disable", "");
RUN("keys" << "CTRL+T", "");

WAIT_ON_OUTPUT("currentWindowTitle", "CopyQ New Tab\n");

RUN("keys" << "ESC", "");
WAIT_ON_OUTPUT("currentWindowTitle", "CopyQ\n");
RUN("enable", "");
Expand Down Expand Up @@ -1656,6 +1662,10 @@ void Tests::tray()

void Tests::menu()
{
#ifdef Q_OS_MAC
SKIP("FIXME: Why doesn't this work on OS X?");
#endif

const auto tab = testTab(1);

RUN("tab" << tab << "add" << "D" << "C" << "B" << "A", "");
Expand All @@ -1681,6 +1691,10 @@ void Tests::traySearch()

void Tests::configTrayTab()
{
#ifdef Q_OS_MAC
SKIP("FIXME: Why doesn't this work on OS X?");
#endif

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

Expand Down
5 changes: 4 additions & 1 deletion utils/travis/script-osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cd build

qt_bin="/usr/local/opt/qt5/bin"

"$qt_bin/qmake" CONFIG+=release ..
"$qt_bin/qmake" CONFIG+=release CONFIG+=tests ..
make
make package_plugins
make package_translations
Expand All @@ -27,6 +27,9 @@ python macdeployqtfix/macdeployqtfix.py "$executable" /usr/local/Cellar/qt5
"$executable" --help
"$executable" --version

# Run tests.
"$executable" tests -silent

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

Expand Down

0 comments on commit 17c8456

Please sign in to comment.