Mercurial > trustbridge
changeset 305:4a3febc6d806
Some minor cleanups. Better debug output more Verify's
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 03 Apr 2014 15:29:58 +0200 |
| parents | eecc06f714fd |
| children | 9c5e6b142611 |
| files | cinst/nssstore_linux.c ui/tests/CMakeLists.txt ui/tests/cinstprocesstest.cpp ui/tests/nsstest.cpp |
| diffstat | 4 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cinst/nssstore_linux.c Thu Apr 03 14:29:49 2014 +0200 +++ b/cinst/nssstore_linux.c Thu Apr 03 15:29:58 2014 +0200 @@ -167,7 +167,7 @@ ERRORPRINTF ("Waitpid failed.\n"); return -1; } - DEBUGPRINTF ("Child returned status: %i", WEXITSTATUS(status)); + DEBUGPRINTF ("Child returned status: %i\n", WEXITSTATUS(status)); return 0; }
--- a/ui/tests/CMakeLists.txt Thu Apr 03 14:29:49 2014 +0200 +++ b/ui/tests/CMakeLists.txt Thu Apr 03 15:29:58 2014 +0200 @@ -51,6 +51,7 @@ endif (WIN32) add_m13_test(nsstest.cpp "${CERTIFICATELIST_SOURCES};${CMAKE_SOURCE_DIR}/cinst/nssstore_linux.c") +add_dependencies(nsstest mozilla) #add_m13_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${M13UI_SOURCES}")
--- a/ui/tests/cinstprocesstest.cpp Thu Apr 03 14:29:49 2014 +0200 +++ b/ui/tests/cinstprocesstest.cpp Thu Apr 03 15:29:58 2014 +0200 @@ -36,6 +36,7 @@ qDebug() << "Stdout:" << proc->readAllStandardOutput(); \ qDebug() << "Stderr:" << proc->readAllStandardError(); \ qDebug() << "Exit code: " << proc->exitCode(); \ + qDebug() << "Exit status: " << proc->exitStatus(); \ } \ QVERIFY(x)
--- a/ui/tests/nsstest.cpp Thu Apr 03 14:29:49 2014 +0200 +++ b/ui/tests/nsstest.cpp Thu Apr 03 15:29:58 2014 +0200 @@ -83,7 +83,8 @@ } QVERIFY((size_t) instList.size() == strv_length(to_install)); - write_stores_nss(to_install, to_remove); + QVERIFY(write_stores_nss(to_install, to_remove) == 0); + } QTEST_GUILESS_MAIN (NSSTest);