Move everything releated to testing into tests.

Change-Id: I28fc488b3de03a8561888969336f2ebc62a97bb0
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
This commit is contained in:
kh1 2012-03-12 16:51:41 +01:00 committed by Karsten Heimrich
parent 6559f16ee3
commit 342f67fa85
24 changed files with 105 additions and 105 deletions

View File

@ -1,70 +0,0 @@
IF "%1" EQU "" (
set OFFLINE_INSTALLER=true
set ONLINE_INSTALLER=true
set REPOGEN=true
set TEST_ONLINE_INSTALLER=false
set TEST_OFFLINE_INSTALLER=false
) else (
set OFFLINE_INSTALLER=false
set ONLINE_INSTALLER=false
set REPOGEN=false
set TEST_ONLINE_INSTALLER=false
set TEST_OFFLINE_INSTALLER=false
)
for %%i in (%1,%2,%3,%4,%5,%6,%7,%8,%9) DO (
IF "%%i" EQU "offline" (
set OFFLINE_INSTALLER=true
)
IF "%%i" EQU "online" (
set ONLINE_INSTALLER=true
)
IF "%%i" EQU "repogen" (
set REPOGEN=true
)
IF "%%i" EQU "test_online" (
set TEST_ONLINE_INSTALLER=true
)
IF "%%i" EQU "test_offline" (
set TEST_OFFLINE_INSTALLER=true
)
)
set AUTO_INSTALLATION_SCRIPT=--script %CD%\auto_installations_script.qs
set LOCAL_REPOSITORY_PATH=file:///%CD%\bin\repository
set LOCAL_REPOSITORY_PATH=%LOCAL_REPOSITORY_PATH:\=/%
call BatchSubstitute.bat http://www.xxxx.com/repository %LOCAL_REPOSITORY_PATH% ..\examples\testapp\config\config.xml > ..\examples\testapp\config\config.xml_new
copy /Y ..\examples\testapp\config\config.xml ..\examples\testapp\config\config.xml_old
move /Y ..\examples\testapp\config\config.xml_new ..\examples\testapp\config\config.xml
IF "%OFFLINE_INSTALLER%" EQU "true" (
echo create offline installer
bin\binarycreator -t bin\installerbase.exe -v -p ..\examples\testapp\packages -c ..\examples\testapp\config --offline-only bin\test-installer-offline.exe com.nokia.testapp
IF errorlevel 1 pause ELSE echo ...done
)
IF "%ONLINE_INSTALLER%" EQU "true" (
echo create online installer
bin\binarycreator -t bin\installerbase.exe -v -n -p ..\examples\testapp\packages -c ..\examples\testapp\config bin\test-installer-online.exe com.nokia.testapp
IF errorlevel 1 pause ELSE echo ...done
)
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 bin\repository com.nokia.testapp
IF errorlevel 1 pause ELSE echo ...done
)
IF "%TEST_OFFLINE_INSTALLER%" EQU "true" (
bin\test-installer-offline.exe --verbose %AUTO_INSTALLATION_SCRIPT%
)
IF "%TEST_ONLINE_INSTALLER%" EQU "true" (
bin\test-installer-online.exe --verbose %AUTO_INSTALLATION_SCRIPT%
)
copy /Y ..\examples\testapp\config\config.xml_old ..\examples\testapp\config\config.xml

View File

@ -1 +0,0 @@
./bin/binarycreator -t bin/installerbase -v -p ../examples/testapp/packages -c ../examples/testapp/config test-installer --offline-only com.nokia.testapp

View File

@ -1,12 +1,4 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += libinstaller installerbase binarycreator repogen archivegen tests
test.commands=(cd tests && $(MAKE) test)
test.target=test
test.depends = $(TARGET)
QMAKE_EXTRA_TARGETS += test
TRANSLATIONS += installerbase/translations/de_de.ts \
installerbase/translations/en_us.ts
SUBDIRS += libinstaller installerbase binarycreator repogen archivegen
TRANSLATIONS += installerbase/translations/de_de.ts installerbase/translations/en_us.ts

View File

@ -1,11 +0,0 @@
TEMPLATE=subdirs
DESTDIR = bin
SUBDIRS += extractarchiveoperationtest environmentvariable
unix:test.commands=./bin/extractarchiveoperationtest
win32:test.commands=bin\\extractarchiveoperationtest.exe
test.target=test
test.depends = $(TARGET)
QMAKE_EXTRA_TARGETS += test

View File

@ -1,11 +1,11 @@
TEMPLATE=subdirs
CONFIG += ordered
SUBDIRS += installerbuilder examples tools
mac:SUBDIRS -= examples
TEMPLATE = subdirs
!macx:SUBDIRS += examples
SUBDIRS += installerbuilder tools
test.target=test
test.commands=(cd installerbuilder && $(MAKE) test)
test.target = test
test.depends = $(TARGET)
QMAKE_EXTRA_TARGETS += test
test.commands = (cd tests && $(QMAKE) && $(MAKE))
include (doc/doc.pri)

View File

@ -8,13 +8,15 @@ CONFIG -= app_bundle
QT += testlib script
QT -= gui
INCLUDEPATH += ../../libinstaller ..
DEPENDPATH += ../../libinstaller ../../common
INCLUDEPATH += ../../installerbuilder/libinstaller ..
DEPENDPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
include(../../libinstaller/libinstaller.pri)
include(../../installerbuilder/libinstaller/libinstaller.pri)
SOURCES = environmentvariabletest.cpp
HEADERS = environmentvariabletest.h
LIBS = -L../../installerbuilder/lib -linstaller $$LIBS
win32:LIBS += ole32.lib oleaut32.lib user32.lib
win32:OBJECTS_DIR = .obj

View File

@ -8,13 +8,14 @@ CONFIG -= app_bundle
QT += testlib script
QT -= gui
INCLUDEPATH += ../../libinstaller ..
DEPENDPATH += ../../libinstaller ../../common
INCLUDEPATH += ../../installerbuilder/libinstaller ..
DEPENDPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
include(../../libinstaller/libinstaller.pri)
include(../../installerbuilder/libinstaller/libinstaller.pri)
SOURCES = extractarchiveoperationtest.cpp
HEADERS = extractarchiveoperationtest.h
LIBS = -L../../installerbuilder/lib -linstaller $$LIBS
win32:LIBS += ole32.lib oleaut32.lib user32.lib
win32:OBJECTS_DIR = .obj

View File

@ -0,0 +1,76 @@
IF "%1" EQU "" (
set OFFLINE_INSTALLER=true
set ONLINE_INSTALLER=true
set REPOGEN=true
set TEST_ONLINE_INSTALLER=false
set TEST_OFFLINE_INSTALLER=false
) else (
set OFFLINE_INSTALLER=false
set ONLINE_INSTALLER=false
set REPOGEN=false
set TEST_ONLINE_INSTALLER=false
set TEST_OFFLINE_INSTALLER=false
)
for %%i in (%1,%2,%3,%4,%5,%6,%7,%8,%9) DO (
IF "%%i" EQU "offline" (
set OFFLINE_INSTALLER=true
)
IF "%%i" EQU "online" (
set ONLINE_INSTALLER=true
)
IF "%%i" EQU "repogen" (
set REPOGEN=true
)
IF "%%i" EQU "test_online" (
set TEST_ONLINE_INSTALLER=true
)
IF "%%i" EQU "test_offline" (
set TEST_OFFLINE_INSTALLER=true
)
)
set AUTO_INSTALLATION_SCRIPT=--script %CD%\auto_installations_script.qs
set BINARY_PATH_RELATIVE=%CD%\..\..\installerbuilder\bin
pushd .
cd %BINARY_PATH_RELATIVE%
set BINARY_PATH_ABSOLUTE=%CD%
popd
set LOCAL_REPOSITORY=file:///%BINARY_PATH_ABSOLUTE%/repository
set LOCAL_REPOSITORY_PATH=%LOCAL_REPOSITORY:\=/%
call BatchSubstitute.bat http://www.xxxx.com/repository %LOCAL_REPOSITORY_PATH% ..\..\examples\testapp\config\config.xml > ..\..\examples\testapp\config\config.xml_new
copy /Y ..\..\examples\testapp\config\config.xml ..\..\examples\testapp\config\config.xml_old
move /Y ..\..\examples\testapp\config\config.xml_new ..\..\examples\testapp\config\config.xml
IF "%OFFLINE_INSTALLER%" EQU "true" (
echo create offline installer
..\..\installerbuilder\bin\binarycreator -t ..\..\installerbuilder\bin\installerbase.exe -v -p ..\..\examples\testapp\packages -c ..\..\examples\testapp\config --offline-only ..\..\installerbuilder\bin\test-installer-offline.exe com.nokia.testapp
IF errorlevel 1 pause ELSE echo ...done
)
IF "%ONLINE_INSTALLER%" EQU "true" (
echo create online installer
..\..\installerbuilder\bin\binarycreator -t ..\..\installerbuilder\bin\installerbase.exe -v -n -p ..\..\examples\testapp\packages -c ..\..\examples\testapp\config ..\..\installerbuilder\bin\test-installer-online.exe com.nokia.testapp
IF errorlevel 1 pause ELSE echo ...done
)
IF "%REPOGEN%" EQU "true" (
echo create online repository
IF exist ..\..\installerbuilder\bin\repository rmdir /S /Q ..\..\installerbuilder\bin\repository
..\..\installerbuilder\bin\repogen.exe -p ..\..\examples\testapp\packages -c ..\..\examples\testapp\config ..\..\installerbuilder\bin\repository com.nokia.testapp
IF errorlevel 1 pause ELSE echo ...done
)
IF "%TEST_OFFLINE_INSTALLER%" EQU "true" (
..\..\installerbuilder\bin\test-installer-offline.exe --verbose %AUTO_INSTALLATION_SCRIPT%
)
IF "%TEST_ONLINE_INSTALLER%" EQU "true" (
..\..\installerbuilder\bin\test-installer-online.exe --verbose %AUTO_INSTALLATION_SCRIPT%
)
copy /Y ..\..\examples\testapp\config\config.xml_old ..\..\examples\testapp\config\config.xml

View File

@ -0,0 +1 @@
../../installerbuilder/bin/binarycreator -t ../../installerbuilder/bin/installerbase -v -p ../../examples/testapp/packages -c ../../examples/testapp/config test-installer --offline-only com.nokia.testapp

7
tests/tests.pro Normal file
View File

@ -0,0 +1,7 @@
TEMPLATE = subdirs
DESTDIR = bin
SUBDIRS += extractarchiveoperationtest environmentvariable fileengineclient fileengineserver
unix:test.commands = ./bin/extractarchiveoperationtest
win32:test.commands = bin\\extractarchiveoperationtest.exe

View File

@ -1,5 +1,8 @@
TEMPLATE=subdirs
CONFIG += ordered
SUBDIRS += fileengineclient fileengineserver extractbinarydata
TEMPLATE = subdirs
SUBDIRS += extractbinarydata \
maddehelper \
repocompare \
repogenfromonlinerepo