Mercurial > hg > sonic-visualiser
changeset 1490:e4bd2a532ced 3.0-integration
More work on getting tests (especially file encoding ones) running on Windows. Various problems here to do with interaction with test filenames in Hg repos
| author | Chris Cannam |
|---|---|
| date | Fri, 06 Jan 2017 15:44:55 +0000 |
| parents | 48e7d1ab05f2 |
| children | d7795c03a03d |
| files | .hgsubstate sonic-visualiser.pro test-svcore-base.pro test-svcore-data-fileio.pro test-svcore-data-model.pro |
| diffstat | 5 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Fri Jan 06 12:11:08 2017 +0000 +++ b/.hgsubstate Fri Jan 06 15:44:55 2017 +0000 @@ -8,6 +8,6 @@ 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp af97cad61ff0a443cdf4a33a4ac867431dadaaae sv-dependency-builds 1a8a8980f39a8e735c90837a4c2260248aafe7f1 svapp -c0cdacc47f4e1ed71cc45e99dfeaf2a866be81a5 svcore +75ad55315db4ec0fc52534a4ce1ed927550233a7 svcore be42a33a3db6c11559166b65c30bcd7248a46c9f svgui 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk
--- a/sonic-visualiser.pro Fri Jan 06 12:11:08 2017 +0000 +++ b/sonic-visualiser.pro Fri Jan 06 15:44:55 2017 +0000 @@ -1,15 +1,14 @@ TEMPLATE = subdirs -!win* { - # We should build and run the tests on any platform, - # but doing it automatically doesn't work so well from - # within an IDE on Windows, so remove that from here - SUBDIRS += \ - sub_test_svcore_base \ +# We build the tests on every platform, though at the time of +# writing they are only automatically run on non-Windows platforms +# (because of the difficulty of getting them running nicely in the +# IDE without causing great confusion if a test fails). +SUBDIRS += \ + sub_test_svcore_base \ sub_test_svcore_data_fileio \ sub_test_svcore_data_model -} SUBDIRS += \ checker \
--- a/test-svcore-base.pro Fri Jan 06 12:11:08 2017 +0000 +++ b/test-svcore-base.pro Fri Jan 06 15:44:55 2017 +0000 @@ -28,4 +28,6 @@ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } -QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT} +!win32* { + QMAKE_POST_LINK = ./$${TARGET} +}
--- a/test-svcore-data-fileio.pro Fri Jan 06 12:11:08 2017 +0000 +++ b/test-svcore-data-fileio.pro Fri Jan 06 15:44:55 2017 +0000 @@ -28,4 +28,6 @@ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } -QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT} +!win32* { + QMAKE_POST_LINK = ./$${TARGET} +}
--- a/test-svcore-data-model.pro Fri Jan 06 12:11:08 2017 +0000 +++ b/test-svcore-data-model.pro Fri Jan 06 15:44:55 2017 +0000 @@ -28,4 +28,6 @@ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) } -QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT} +!win32* { + QMAKE_POST_LINK = ./$${TARGET} +}