diff options
| author | axis <qt-info@nokia.com> | 2009-06-02 08:14:04 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-02 08:14:04 (GMT) |
| commit | 3c594257c4aedf113de92c5888e74f676ba87385 (patch) | |
| tree | e309c7502e13f552203b509494a20792125fed29 /tests/auto/selftests/expected_skip.txt | |
| parent | 539989f41316329e7aba69ba97e1579eed6036e6 (diff) | |
| parent | 0ff7b68f2e3f184d809cf6fd13ff930efa493e9f (diff) | |
| download | Qt-3c594257c4aedf113de92c5888e74f676ba87385.zip Qt-3c594257c4aedf113de92c5888e74f676ba87385.tar.gz Qt-3c594257c4aedf113de92c5888e74f676ba87385.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
Diffstat (limited to 'tests/auto/selftests/expected_skip.txt')
| -rw-r--r-- | tests/auto/selftests/expected_skip.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt index ba41e67..f3be5b5 100644 --- a/tests/auto/selftests/expected_skip.txt +++ b/tests/auto/selftests/expected_skip.txt @@ -7,7 +7,7 @@ SKIP : tst_Skip::emptytest() skipping all Loc: [/home/fenglich/dev/qt-4.3/tests/auto/selftests/skip/tst_skip.cpp(45)] SKIP : tst_Skip::singleSkip(local 1) skipping one Loc: [/home/fenglich/dev/qt-4.3/tests/auto/selftests/skip/tst_skip.cpp(64)] -this line should only be reached once (true) +QDEBUG : tst_Skip::singleSkip(local 2) this line should only be reached once (true) PASS : tst_Skip::singleSkip() PASS : tst_Skip::cleanupTestCase() Totals: 3 passed, 0 failed, 3 skipped |