diff options
Diffstat (limited to 'tests/auto/corelib/codecs/qtextcodec')
5 files changed, 16 insertions, 19 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 f8f9387abb..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); @@ -2429,7 +2429,7 @@ void tst_QTextCodec::userCodec() QVERIFY(!QTextCodec::availableCodecs().contains("UserCodec")); QVERIFY(!QTextCodec::codecForName("UserCodec")); - QTextCodec *codec = new UserCodec; + UserCodec *codec = new UserCodec; executedOnce = true; QList<QByteArray> availableCodecs = QTextCodec::availableCodecs(); @@ -2448,6 +2448,11 @@ void tst_QTextCodec::userCodec() pcodec = QTextCodec::codecForMib(5000); QCOMPARE(pcodec, codec); + + delete codec; + + pcodec = QTextCodec::codecForName("UserCodec"); + QCOMPARE(pcodec, nullptr); } struct DontCrashAtExit { |