Commit graph

24 commits

Author SHA1 Message Date
Ivailo Monev
804b17e368 bunch of OS X build fixes
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 16:35:05 +00:00
Ivailo Monev
79116f99d8 put the Homebrew prefix workaround where it belongs
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 16:02:17 +00:00
Ivailo Monev
b981aae566 another try to fix the OS X build in Travis
it seems that Homebrew installs some packages into /usr/local/opt so by
setting CMAKE_INSTALL_PREFIX to that path find_library() and such should
look there first

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:45:15 +00:00
Ivailo Monev
653d996561 try to install libpng, libtiff and jpeg-turbo that match the build architecture for OS X in Travis
I have no idea if this will solve the linking problem tough

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-31 15:29:02 +00:00
Ivailo Monev
5bf2222f30 enable Linux tests in Travis again
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-26 12:19:23 +00:00
Ivailo Monev
d62a1d9a62 do not run build verbose in Travis
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 13:07:34 +00:00
Ivailo Monev
46ca846279 make building verbose on OS X in Travis
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 10:36:15 +00:00
Ivailo Monev
f8200ae7b3 experimental mac mkspec file and disabling test on linux for now (in Travis)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 09:52:09 +00:00
Ivailo Monev
6637677a1a let's try OS X
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
2016-07-25 09:34:46 +00:00
Ivailo Monev
4e9d4feb70 Revert "run Travis tests via make test again"
This reverts commit a12b922054.
2016-07-13 14:44:53 +00:00
Ivailo Monev
4756b5ed02 trying out ccahe in Travis
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-12 12:52:11 +00:00
Ivailo Monev
1032c8ed0b break out of the loop when the benchmark fails
previously a reapted fail of QVERIFY() inside QBENCHMARK() would cause the
test program to hang. also re-enabling network tests in Travis environment

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-12 03:43:31 +00:00
Ivailo Monev
aa5f508002 make it possible and do skip network related tests in the Travis environment
some tests use QVERIFY() inside QBENCHMARK() which hangs the test
when QVERIFY() fails (this applies to stock Qt4 and with Qt5 as
well)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-06 22:13:54 +00:00
Ivailo Monev
d880568d1f revert to "legacy" test environment
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-05 14:40:05 +00:00
Ivailo Monev
bae38f0462 libtiff5-dev is not available to the containers desipite being listed as such
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-05 14:32:34 +00:00
Ivailo Monev
c07acca796 giving a shot at container based Travis test environment
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-05 14:29:39 +00:00
Ivailo Monev
a12b922054 run Travis tests via make test again
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-07-04 10:59:49 +00:00
Ivailo Monev
0551719acd imitate a display for Travis tests
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-30 16:00:25 +00:00
Ivailo Monev
8dc691fdb9 run Travis tests in verbose mode for now
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-30 15:18:24 +00:00
Ivailo Monev
5129e4e097 another attempt to fix the Travis build
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-30 02:46:27 +00:00
Ivailo Monev
0eb257c03e an attempt to fix the Travis build
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-30 02:09:22 +00:00
Ivailo Monev
dff4cb6020 do not polute Travis log with CMake dev warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-30 00:58:06 +00:00
Ivailo Monev
74f69bc85a adjust dependencies
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-30 00:48:54 +00:00
Ivailo Monev
cbb13d8124 add Travis CI file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-30 00:38:44 +00:00