diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-07-25 09:21:38 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-07-25 10:27:42 +0000 |
| commit | 41ed77e59bb3e41ad502dd0151e6a577cba72ec8 (patch) | |
| tree | 30979ad9badb4da39a27afa644a85418f2dad517 /tests/auto/corelib/codecs | |
| parent | dcd35d13e05a1d2ff2fa4cf86ebd857a58a80d45 (diff) | |
tst_qtextcodec: Use qt_test_helper functionality
The helper application is only needed for Unix platforms, so there is no
need to build it for other configurations.
Change-Id: I4ebb896c66d3ded016f72fdbe631ec2f1276db22
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests/auto/corelib/codecs')
5 files changed, 10 insertions, 18 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/echo/echo.pro b/tests/auto/corelib/codecs/qtextcodec/echo/echo.pro index bf791ffc61..512da8939b 100644 --- a/tests/auto/corelib/codecs/qtextcodec/echo/echo.pro +++ b/tests/auto/corelib/codecs/qtextcodec/echo/echo.pro @@ -1,6 +1,4 @@ SOURCES += main.cpp QT = core -CONFIG -= app_bundle debug_and_release_target -CONFIG += console - +load(qt_test_helper) diff --git a/tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro index 302d887fc7..15de02a42d 100644 --- a/tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro +++ b/tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = test echo +SUBDIRS = test.pro +unix: SUBDIRS += echo diff --git a/tests/auto/corelib/codecs/qtextcodec/test.pro b/tests/auto/corelib/codecs/qtextcodec/test.pro new file mode 100644 index 0000000000..7505c5ad51 --- /dev/null +++ b/tests/auto/corelib/codecs/qtextcodec/test.pro @@ -0,0 +1,6 @@ +CONFIG += testcase +QT = core testlib +SOURCES = tst_qtextcodec.cpp + +TARGET = tst_qtextcodec +TESTDATA += *.txt diff --git a/tests/auto/corelib/codecs/qtextcodec/test/test.pro b/tests/auto/corelib/codecs/qtextcodec/test/test.pro deleted file mode 100644 index e0a1bbd88e..0000000000 --- a/tests/auto/corelib/codecs/qtextcodec/test/test.pro +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG += testcase -QT = core testlib -SOURCES = ../tst_qtextcodec.cpp - -TARGET = ../tst_qtextcodec -win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qtextcodec - } else { - TARGET = ../../release/tst_qtextcodec - } -} -TESTDATA += ../*.txt diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index b3b7c082cc..6cadebfd7f 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -2092,7 +2092,7 @@ void tst_QTextCodec::toLocal8Bit() QSKIP("No qprocess support", SkipAll); #else QProcess process; - process.start("echo/echo"); + process.start("echo_helper"); QString string(QChar(0x410)); process.write((const char*)string.utf16(), string.length()*2); |