diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 16:44:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-27 16:44:41 +0100 |
| commit | 1f8ec5b6a4bed3cfa02eaa36d39bceb7d37fc891 (patch) | |
| tree | f225e5fe3d34ba9468634628338a16b1d087071f /tests | |
| parent | b170fae8b21e25b9ddfc66f985e7d7040ab3d2c0 (diff) | |
| parent | ddf7aa85ec7bada4a96b2692e4b9f1bdd709cbad (diff) | |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
installerfw.pri
Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-framework/checker/testrunner/registry.py | 2 | ||||
| -rw-r--r-- | tests/test-installer/create-test-installer.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-framework/checker/testrunner/registry.py b/tests/test-framework/checker/testrunner/registry.py index 430324ad8..ccbab655c 100644 --- a/tests/test-framework/checker/testrunner/registry.py +++ b/tests/test-framework/checker/testrunner/registry.py @@ -53,7 +53,7 @@ _registry["HKEY_USERS"] = _winreg.HKEY_USERS _registry["HKEY_CURRENT_CONFIG"] = _winreg.HKEY_CURRENT_CONFIG def splitKey( key ): - key, seperator, subKey = key.partition( '\\' ) + key, separator, subKey = key.partition( '\\' ) return _registry[key], subKey def checkKey( key, value, expectedData ): diff --git a/tests/test-installer/create-test-installer.bat b/tests/test-installer/create-test-installer.bat index bb8aa5c02..eb9ac9dc8 100644 --- a/tests/test-installer/create-test-installer.bat +++ b/tests/test-installer/create-test-installer.bat @@ -106,7 +106,7 @@ IF "%ONLINE_INSTALLER%" EQU "true" ( IF "%REPOGEN%" EQU "true" ( echo create online repository @IF exist ..\..\bin\repository rmdir /S /Q ..\..\bin\repository - ..\..\bin\repogen.exe -p ..\..\examples\testapp\packages -c ..\..\examples\testapp\config\config.xml ..\..\bin\repository + ..\..\bin\repogen.exe -p ..\..\examples\testapp\packages ..\..\bin\repository @if %ERRORLEVEL% NEQ 0 goto error_marker ELSE goto done_marker ) |