diff options
| author | Alex <qt-info@nokia.com> | 2009-09-10 13:04:15 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2009-09-10 13:04:15 +1000 |
| commit | b6297b985dfa2fa5d5792a5f50c4271462b32502 (patch) | |
| tree | bdc595a8a1e38cbe482ab47f377204c5327edbc5 /bin | |
| parent | 04f01cc9273d3af2f7f8997ab2bbf8ee3f35c11a (diff) | |
integrate sysinfo unit tests
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rununittests.bat | 11 | ||||
| -rwxr-xr-x | bin/rununittests.sh | 18 |
2 files changed, 25 insertions, 4 deletions
diff --git a/bin/rununittests.bat b/bin/rununittests.bat index 55c91c0e12..8dc155e072 100644 --- a/bin/rununittests.bat +++ b/bin/rununittests.bat @@ -1,9 +1,9 @@ set SAVED_PWD="%CD%" set BATCH_PATH=%~dp0 -set PATH=%BATCH_PATH%..\build\Debug\bin;%PATH% +set PATH=%BATCH_PATH%..\lib;%PATH% -cd %BATCH_PATH%..\build\tests\Debug\bin +cd %BATCH_PATH%..\build\tests\bin ::ServiceFramework tst_servicemetadata.exe @@ -39,5 +39,12 @@ tst_qvaluespaceitem.exe tst_qsystemreadwritelock.exe tst_qsystemreadwritelock_oop.exe +::QSystemInformation +tst_qsystemdeviceinfo.exe +tst_qsystemdisplayinfo.exe +tst_qsysteminfo.exe +tst_qsystemmemoryinfo.exe +tst_qsystemnetworkinfo.exe + cd %SAVED_PWD% diff --git a/bin/rununittests.sh b/bin/rununittests.sh index 03b3e9d947..61cf217d9c 100755 --- a/bin/rununittests.sh +++ b/bin/rununittests.sh @@ -6,8 +6,15 @@ shell=`readlink -f "$0"`; shell_path=`dirname $shell`; SAVED_PWD=$PWD; -cd $shell_path/../build/tests/Debug/bin -LD_LIBRARY_PATH=$shell_path/../build/Debug/bin:$LD_LIBRARY_PATH +if [ ! -d "$shell_path/../build/tests/bin" ]; then + echo -e 'Unit tests have not been built.' + echo -e 'Please run configure with the -tests switch.' + exit +fi +cd $shell_path/../build/tests/bin + + +LD_LIBRARY_PATH=$shell_path/../lib:$LD_LIBRARY_PATH #service framework ./tst_qserviceinterfacedescriptor @@ -43,5 +50,12 @@ LD_LIBRARY_PATH=$shell_path/../build/Debug/bin:$LD_LIBRARY_PATH ./tst_qsystemreadwritelock ./tst_qsystemreadwritelock_oop +#QSystemInformation +./tst_qsystemdeviceinfo +./tst_qsystemdisplayinfo +./tst_qsysteminfo +./tst_qsystemmemoryinfo +./tst_qsystemnetworkinfo + cd $SAVED_PWD |