From 6cebef6e1609f32c3512e442ef40c04b847f51f8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 14 Aug 2009 16:41:26 +0200 Subject: Remove the history files for autotest, and move the whitelist files to autotest repo. --- tests/auto/JoinResults.py | 66 ---------- tests/auto/_Categories/Qt3Support.txt | 51 -------- tests/auto/_Categories/QtCore.txt | 118 ------------------ tests/auto/_Categories/QtDBus.txt | 15 --- tests/auto/_Categories/QtGui.txt | 196 ------------------------------ tests/auto/_Categories/QtHelp.txt | 5 - tests/auto/_Categories/QtNetwork.txt | 33 ----- tests/auto/_Categories/QtOpenGl.txt | 1 - tests/auto/_Categories/QtScript.txt | 12 -- tests/auto/_Categories/QtSql.txt | 11 -- tests/auto/_Categories/QtSvg.txt | 3 - tests/auto/_Categories/QtTest.txt | 1 - tests/auto/_Categories/QtUiTools.txt | 1 - tests/auto/_Categories/QtWebkit.txt | 5 - tests/auto/_Categories/QtXml.txt | 5 - tests/auto/_Categories/QtXmlPatterns.txt | 27 ---- tests/auto/_Categories/all_categories.txt | 16 --- tests/auto/_Categories/phonon.txt | 2 - tests/auto/_Categories/qmake.txt | 1 - tests/auto/autobuildruncategory.bat | 11 -- tests/auto/autobuildrunsingle.bat | 71 ----------- tests/auto/autobuildtests.bat | 19 --- tests/auto/autobuildtestsmain.bat | 38 ------ tests/auto/compilecategory.bat | 4 - tests/auto/compilesingle.bat | 28 ----- 25 files changed, 740 deletions(-) delete mode 100644 tests/auto/JoinResults.py delete mode 100644 tests/auto/_Categories/Qt3Support.txt delete mode 100644 tests/auto/_Categories/QtCore.txt delete mode 100644 tests/auto/_Categories/QtDBus.txt delete mode 100644 tests/auto/_Categories/QtGui.txt delete mode 100644 tests/auto/_Categories/QtHelp.txt delete mode 100644 tests/auto/_Categories/QtNetwork.txt delete mode 100644 tests/auto/_Categories/QtOpenGl.txt delete mode 100644 tests/auto/_Categories/QtScript.txt delete mode 100644 tests/auto/_Categories/QtSql.txt delete mode 100644 tests/auto/_Categories/QtSvg.txt delete mode 100644 tests/auto/_Categories/QtTest.txt delete mode 100644 tests/auto/_Categories/QtUiTools.txt delete mode 100644 tests/auto/_Categories/QtWebkit.txt delete mode 100644 tests/auto/_Categories/QtXml.txt delete mode 100644 tests/auto/_Categories/QtXmlPatterns.txt delete mode 100644 tests/auto/_Categories/all_categories.txt delete mode 100644 tests/auto/_Categories/phonon.txt delete mode 100644 tests/auto/_Categories/qmake.txt delete mode 100644 tests/auto/autobuildruncategory.bat delete mode 100644 tests/auto/autobuildrunsingle.bat delete mode 100644 tests/auto/autobuildtests.bat delete mode 100644 tests/auto/autobuildtestsmain.bat delete mode 100644 tests/auto/compilecategory.bat delete mode 100644 tests/auto/compilesingle.bat diff --git a/tests/auto/JoinResults.py b/tests/auto/JoinResults.py deleted file mode 100644 index 8a98572..0000000 --- a/tests/auto/JoinResults.py +++ /dev/null @@ -1,66 +0,0 @@ -import string, sys, os, datetime, time, re -import socket - -Enviroment='' -RstPath='' -QtVersion='' - -def JoinResults(): - timestamp = time.localtime() - - #result_qt_WITH_symbian_ON_2008-05-15_09-42-48_USING_4.4.0-rc1.xml - rstFileName = time.strftime(RstPath+'\\result\\result_qt_WITH_symbian_ON_%Y-%m-%d_%H-%M-%S_USING_'+QtVersion+'.xml', timestamp) - rst = open(rstFileName,'w') - - rst.write('\n') - rst.write('\n') - rst.write('\n') - rst.write(''+socket.gethostname()+'\n') - rst.write('symbian-'+Enviroment+'\n') - rst.write('\n') - rst.write(time.strftime('\n',timestamp)) - - - for root, dirs, files in os.walk(RstPath): - for name in files: - if not re.search('result_qt_WITH_', name ) and \ - re.match(name.split('.')[1], 'xml'): - rst.write('\n') - path = root+'/'+name - temp = open(path,'r') - templines = temp.readlines() - Validate( templines ) - rst.writelines(templines); - temp.close() - rst.write('\n') - - rst.write('\n') - rst.close - -def Validate(lines): - regexp1 = re.compile('\s*\s*') - regexp2 = re.compile('\s* 0 and regexp1.search(line): - if regexp1Flag: - lines[index] = '' - else: - regexp1Flag = True - elif len(line) > 0 and regexp2.search(line): - if regexp2Flag: - lines[index] = '' - else: - regexp2Flag = True - else: - regexp1Flag = False - regexp2Flag = False - - -if __name__ == '__main__': - Enviroment = sys.argv[1] - RstPath = sys.argv[2] - QtVersion = sys.argv[3] - - JoinResults() diff --git a/tests/auto/_Categories/Qt3Support.txt b/tests/auto/_Categories/Qt3Support.txt deleted file mode 100644 index a55523c..0000000 --- a/tests/auto/_Categories/Qt3Support.txt +++ /dev/null @@ -1,51 +0,0 @@ -q3accel -q3action -q3actiongroup -q3buttongroup -q3canvas -q3checklistitem -q3combobox -q3cstring -q3databrowser -q3dateedit -q3datetimeedit -q3deepcopy -q3dict -q3dns -q3dockwindow -q3filedialog -q3frame -q3groupbox -q3hbox -q3header -q3iconview -q3listbox -q3listview -q3listviewitemiterator -q3mainwindow -q3popupmenu -q3process -q3progressbar -q3progressdialog -q3ptrlist -q3richtext -q3scrollview -q3semaphore -q3serversocket -q3socket -q3socketdevice -q3sqlcursor -q3sqlselectcursor -q3stylesheet -q3tabdialog -q3table -q3textbrowser -q3textedit -q3textstream -q3timeedit -q3toolbar -q3uridrag -q3urloperator -q3valuelist -q3valuevector -q3widgetstack diff --git a/tests/auto/_Categories/QtCore.txt b/tests/auto/_Categories/QtCore.txt deleted file mode 100644 index 452b6ba..0000000 --- a/tests/auto/_Categories/QtCore.txt +++ /dev/null @@ -1,118 +0,0 @@ -# QtCore - -collections -exceptionsafety -qabstractitemmodel -#Requires STL -qalgorithms -qanimationgroup -qatomicint -qatomicpointer -qbitarray -qbuffer -qbytearray -qbytearraymatcher -qcache -qchar -qcontiguouscache -qcoreapplication -qcryptographichash -qdatastream -qdate -qdatetime -qdebug -qdir -qdiriterator -qeasingcurve -qevent -qeventloop -qexplicitlyshareddatapointer -qfile cetest-subdir: test -qfileinfo -qfilesystemwatcher -qflags -qfuture -qfuturewatcher -qgetputenv -qglobal -qhash -qiodevice -qlibrary cetest-subdir: tst -qline -qlist -qlocale cetest-subdir: test -qmap -qmetaobject -qmetatype -qmutex -qmutexlocker -qnumeric -qobject cetest-pro: tst_qobject.pro -qobjectperformance -qobjectrace -qparallelanimationgroup -qplugin cetest-pro: tst_qplugin.pro -qpluginloader cetest-subdir: tst -qpoint -qpointer -qprocess cetest-subdir: test -qpropertyanimation -qqueue -qrand -qreadlocker -qreadwritelock -qrect -qregexp -qresourceengine -qringbuffer -qscopedpointer -qsemaphore -qsequentialanimationgroup -qset -qsettings -qsharedmemory cetest-subdir: test -qsharedpointer -qsignalmapper -qsignalspy -qsize -qsizef -qsocketnotifier -qstate -qstatemachine -#Requires STL -qstl -qstring -qstringlist -qstringmatcher -qsysinfo -qsystemsemaphore cetest-subdir: test -#qtconcurrentfilter Not supported yet for s60 -> skip(std) -# Uses std, though unclear if it is actually needed. To be re-investigated when QT_NO_CONCURRENT is removed. -#qtconcurrentiteratekernel -#qtconcurrentmap not supported yet for s60 -> skip(std) -qtconcurrentrun -qtconcurrentthreadengine -qtemporaryfile -qtextboundaryfinder -qtextcodec -qtextstream cetest-subdir: test -qthread -qthreadonce -qthreadpool -qthreadstorage -qtime -qtimeline -qtimer -# Requires MD5 Qt solutions to work -#qtmd5 -qtranslator -qurl -quuid -qvariant -qvarlengtharray -qvector -qwaitcondition -qwineventnotifier -qwritelocker -q_func_info -utf8 diff --git a/tests/auto/_Categories/QtDBus.txt b/tests/auto/_Categories/QtDBus.txt deleted file mode 100644 index 26490f1..0000000 --- a/tests/auto/_Categories/QtDBus.txt +++ /dev/null @@ -1,15 +0,0 @@ -qdbusabstractadaptor -qdbusconnection -qdbuscontext -qdbusinterface -qdbuslocalcalls -qdbusmarshall -qdbusmetaobject -qdbusmetatype -qdbuspendingcall -qdbuspendingreply -qdbusperformance -qdbusreply -qdbusserver -qdbusthreading -qdbusxmlparser diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt deleted file mode 100644 index d8af499..0000000 --- a/tests/auto/_Categories/QtGui.txt +++ /dev/null @@ -1,196 +0,0 @@ -exceptionsafety_objects -#gestures This test is incomplete and also missing from auto.pro -> disabled for now -languagechange -math3d -modeltest -qabstractbutton -qabstractitemview -#qabstractprintdialog NO PRINTING SUPPORT -qabstractproxymodel -qabstractscrollarea -qabstractslider -qabstractspinbox -qabstracttextdocumentlayout -#qaccessibility Requires sql support -> disabled for now -#qaccessibility_mac -qaction -qactiongroup -qapplication cetest-subdir: test -qboxlayout -qbrush -qbuttongroup -qcalendarwidget -qcheckbox -qclipboard cetest-subdir: test -qcolor -qcolordialog -qcolumnview -qcombobox -qcommandlinkbutton -qcompleter -qcomplextext -#qcopchannel QCOP NOT SUPPORTED -qcssparser -qdatawidgetmapper -qdatetimeedit -qdesktopservices -qdesktopwidget -qdial -qdialog -qdialogbuttonbox -#qdirectpainter cetest-subdir: test TEST IS FOR EMBEDDED LINUX ONLY -qdirmodel -qdockwidget -qdoublespinbox -qdoublevalidator -qdrag -qerrormessage -qfiledialog -qfileiconprovider -qfilesystemmodel -qfocusevent -qfocusframe -qfont -qfontcombobox -qfontdatabase -qfontdialog -qfontmetrics -qformlayout -qgraphicsgridlayout -qgraphicsitem -qgraphicsitemanimation -qgraphicslayout -qgraphicslayoutitem -qgraphicslinearlayout -qgraphicsobject -qgraphicspixmapitem -qgraphicspolygonitem -qgraphicsproxywidget -qgraphicsscene -qgraphicsview -qgraphicswidget -qgridlayout -qgroupbox -qguivariant -qheaderview -qicoimageformat -qicon -qimage -qimageiohandler -qimagereader -qimagewriter -qinputcontext -qinputdialog -qintvalidator -qitemdelegate -qitemeditorfactory -qitemmodel -qitemselectionmodel -qitemview -qkeysequence -qlabel -qlayout -qlcdnumber -qlineedit -qlistview -qlistwidget -#qmacstyle -qmainwindow -#qmdiarea Not relevant for S60, skip for now -#qmdisubwindow not relevant for S60, skip for now -qmenu -qmenubar -qmessagebox -qmouseevent -qmouseevent_modal -qmovie -qmultiscreen -qpaintengine -qpainter -qpainterpath -qpainterpathstroker -qpalette -qpathclipper -qpen -qpicture -qpixmap -qpixmapcache -qpixmapfilter -qplaintextedit -#qprinter NO PRINTING SUPPORT ON SYMBIAN YET -#qprinterinfo -qprogressbar -qprogressdialog -qpushbutton -qradiobutton -qregexpvalidator -qregion -qscrollarea -qscrollbar -qshortcut -qsidebar -qsizegrip -qslider -qsortfilterproxymodel -qsound -qspinbox -qsplitter -qstackedlayout -qstackedwidget -qstandarditem -qstandarditemmodel -qstatusbar -qstringlistmodel -qstyle -qstyleoption -qstylesheetstyle -qsyntaxhighlighter -#qsystemtrayicon not relevant for s60, skip for now -qtabbar -qtableview -qtablewidget -qtabwidget -qtessellator -qtextblock -qtextbrowser -qtextcursor -qtextdocument -qtextdocumentfragment -qtextdocumentlayout -qtextedit -qtextformat -qtextlayout -qtextlist -qtextobject -qtextodfwriter -#This test can only be compiled on HW currently, because it does not use reduced exports -#Because we are planning to use class level exports also in HW later on, there is no -#sense to enable this at all -#qtextpiecetable -qtextscriptengine -qtexttable -qtoolbar -qtoolbox -qtoolbutton -qtooltip -qtouchevent -qtransform -qtransformedscreen -qtreeview -qtreewidget -qtreewidgetitemiterator -qtwidgets -qundogroup -qundostack -qwidget -qwidgetaction -qwidget_window -qwindowsurface -qwizard -qwmatrix -qworkspace -qwsembedwidget -qwsinputmethod -qwswindowsystem -qx11info -qzip diff --git a/tests/auto/_Categories/QtHelp.txt b/tests/auto/_Categories/QtHelp.txt deleted file mode 100644 index 89e01fc..0000000 --- a/tests/auto/_Categories/QtHelp.txt +++ /dev/null @@ -1,5 +0,0 @@ -qhelpcontentmodel -qhelpenginecore -qhelpgenerator -qhelpindexmodel -qhelpprojectdata diff --git a/tests/auto/_Categories/QtNetwork.txt b/tests/auto/_Categories/QtNetwork.txt deleted file mode 100644 index 30645d7..0000000 --- a/tests/auto/_Categories/QtNetwork.txt +++ /dev/null @@ -1,33 +0,0 @@ -networkselftest -#qsocketnotifier -qabstractnetworkcache -qabstractsocket -qftp -qhostaddress -qhostinfo -qhttp -qhttpnetworkconnection -qhttpnetworkreply -qhttpsocketengine -qlocalsocket cetest-subdir: test -qnativesocketengine -#requires gui, but is more network test -qnetworkaccessmanager_and_qprogressdialog -qnetworkaddressentry -qnetworkcachemetadata -qnetworkcookie -qnetworkcookiejar -qnetworkdiskcache -qnetworkinterface -qnetworkproxy -qnetworkreply cetest-subdir: test -qnetworkrequest -qsocks5socketengine -qsslcertificate -qsslcipher -qsslerror -qsslkey -qsslsocket -qtcpserver cetest-subdir: test -qtcpsocket cetest-subdir: test -qudpsocket cetest-subdir: test diff --git a/tests/auto/_Categories/QtOpenGl.txt b/tests/auto/_Categories/QtOpenGl.txt deleted file mode 100644 index a4e12ba..0000000 --- a/tests/auto/_Categories/QtOpenGl.txt +++ /dev/null @@ -1 +0,0 @@ -qgl \ No newline at end of file diff --git a/tests/auto/_Categories/QtScript.txt b/tests/auto/_Categories/QtScript.txt deleted file mode 100644 index 3b7e79a..0000000 --- a/tests/auto/_Categories/QtScript.txt +++ /dev/null @@ -1,12 +0,0 @@ -qscriptable -qscriptclass -qscriptcontext -qscriptcontextinfo -qscriptengine -qscriptengineagent -#qscriptenginedebugger does not compile, requires QtScriptTools.lib -qscriptjstestsuite -qscriptstring -qscriptv8testsuite -qscriptvalue -qscriptvalueiterator diff --git a/tests/auto/_Categories/QtSql.txt b/tests/auto/_Categories/QtSql.txt deleted file mode 100644 index 4fc1614..0000000 --- a/tests/auto/_Categories/QtSql.txt +++ /dev/null @@ -1,11 +0,0 @@ -qsql -qsqldatabase -qsqldriver -qsqlerror -qsqlfield -qsqlquery -qsqlquerymodel -qsqlrecord -qsqlrelationaltablemodel -qsqltablemodel -qsqlthread diff --git a/tests/auto/_Categories/QtSvg.txt b/tests/auto/_Categories/QtSvg.txt deleted file mode 100644 index 8bd3cb2..0000000 --- a/tests/auto/_Categories/QtSvg.txt +++ /dev/null @@ -1,3 +0,0 @@ -qsvgdevice -qsvggenerator -qsvgrenderer diff --git a/tests/auto/_Categories/QtTest.txt b/tests/auto/_Categories/QtTest.txt deleted file mode 100644 index 082a028..0000000 --- a/tests/auto/_Categories/QtTest.txt +++ /dev/null @@ -1 +0,0 @@ -selftests diff --git a/tests/auto/_Categories/QtUiTools.txt b/tests/auto/_Categories/QtUiTools.txt deleted file mode 100644 index 0df0e3c..0000000 --- a/tests/auto/_Categories/QtUiTools.txt +++ /dev/null @@ -1 +0,0 @@ -uiloader \ No newline at end of file diff --git a/tests/auto/_Categories/QtWebkit.txt b/tests/auto/_Categories/QtWebkit.txt deleted file mode 100644 index 90ea514..0000000 --- a/tests/auto/_Categories/QtWebkit.txt +++ /dev/null @@ -1,5 +0,0 @@ -qwebelement -qwebframe -qwebhistory -qwebhistoryinterface -qwebpage \ No newline at end of file diff --git a/tests/auto/_Categories/QtXml.txt b/tests/auto/_Categories/QtXml.txt deleted file mode 100644 index ec56646..0000000 --- a/tests/auto/_Categories/QtXml.txt +++ /dev/null @@ -1,5 +0,0 @@ -qdom -qxml -qxmlinputsource -qxmlsimplereader -qxmlstream diff --git a/tests/auto/_Categories/QtXmlPatterns.txt b/tests/auto/_Categories/QtXmlPatterns.txt deleted file mode 100644 index 17de3ef..0000000 --- a/tests/auto/_Categories/QtXmlPatterns.txt +++ /dev/null @@ -1,27 +0,0 @@ -checkxmlfiles -patternistexamplefiletree -patternistexamples -patternistheaders -qabstractmessagehandler -qabstracturiresolver -qabstractxmlforwarditerator -qabstractxmlnodemodel -qabstractxmlreceiver -qapplicationargumentparser -qautoptr -qsimplexmlnodemodel -qsourcelocation -qtokenautomaton -qxmlformatter -qxmlitem -qxmlname -qxmlnamepool -qxmlnodemodelindex -qxmlquery -qxmlresultitems -qxmlserializer -xmlpatterns -xmlpatternsdiagnosticsts -xmlpatternsview -xmlpatternsxqts -xmlpatternsxslts diff --git a/tests/auto/_Categories/all_categories.txt b/tests/auto/_Categories/all_categories.txt deleted file mode 100644 index cc31f4b..0000000 --- a/tests/auto/_Categories/all_categories.txt +++ /dev/null @@ -1,16 +0,0 @@ -#unsorted - -atwrapper -bic -compile -compilerwarnings -headers -macgui -macplist -symbols -uiloader -moc -rcc -uic -uic3 -qmake \ No newline at end of file diff --git a/tests/auto/_Categories/phonon.txt b/tests/auto/_Categories/phonon.txt deleted file mode 100644 index 67911b3..0000000 --- a/tests/auto/_Categories/phonon.txt +++ /dev/null @@ -1,2 +0,0 @@ -mediaobject -mediaobject_wince_ds9 diff --git a/tests/auto/_Categories/qmake.txt b/tests/auto/_Categories/qmake.txt deleted file mode 100644 index 8fa141f..0000000 --- a/tests/auto/_Categories/qmake.txt +++ /dev/null @@ -1 +0,0 @@ -qmake \ No newline at end of file diff --git a/tests/auto/autobuildruncategory.bat b/tests/auto/autobuildruncategory.bat deleted file mode 100644 index 3f434ee..0000000 --- a/tests/auto/autobuildruncategory.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -REM Compile all test cases from given category file - -REM Create root directory for autotest results -IF NOT EXIST %3 MKDIR %3 - -REM Set Module variable -FOR /F %%i IN ("%1") DO SET MODULE=%%~ni - -REM run single test -FOR /F "eol=# tokens=1*" %%i in (%1) do CALL autobuildrunsingle.bat %2 %%i %3 %4 %%j %%k diff --git a/tests/auto/autobuildrunsingle.bat b/tests/auto/autobuildrunsingle.bat deleted file mode 100644 index adb9871..0000000 --- a/tests/auto/autobuildrunsingle.bat +++ /dev/null @@ -1,71 +0,0 @@ -@echo off -REM runtest - -SET QTVERSION=%4 - -IF %1 == winscw goto winscw: -IF %1 == armv5 goto armv5: -IF %1 == gcce goto gcce: -goto end: - -:winscw -IF EXIST \epoc32\release\winscw\udeb\tst_%2.exe ( - call \epoc32\release\winscw\udeb\tst_%2.exe -lightxml - if ERRORLEVEL 1 ( - echo ^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^^^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^^^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^ >> \Epoc32\winscw\c\system\data\out.txt - echo ^ >> \Epoc32\winscw\c\system\data\out.txt ) - copy /Y \Epoc32\winscw\c\system\data\out.txt %3\%2.xml - goto end: -) ELSE ( -goto notExist: -) - -:ARMV5 -IF EXIST \epoc32\release\armv5\urel\tst_%2.exe ( - pushd . - cd %2 - IF _%5 == _cetest-subdir: ( - echo Running cetest from subdir: %6 - cd %6 - ) - IF _%5 == _cetest-pro: ( - call cetest -release -f %6 -project-delete -lightxml -o %3\%2.xml - ) ELSE ( - call cetest -release -project-delete -lightxml -o %3\%2.xml - ) - if EXIST %3\%2.xml if ERRORLEVEL 1 ( - echo ^ >> %3\%2.xml - echo ^ >> %3\%2.xml - echo ^^^ >> %3\%2.xml - echo ^^^ >> %3\%2.xml - echo ^ >> %3\%2.xml - echo ^ >> %3\%2.xml - ) - popd - goto end: -) ELSE ( -goto notExist: -) - -:gcce -goto end: - -:notExist -echo AAA: %3\%2.xml -echo ^ >> %3\%2.xml -echo ^%QTVERSION%^ >> %3\%2.xml -echo ^%QTVERSION%^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^^^ >> %3\%2.xml -echo ^^^ >> %3\%2.xml -echo ^ >> %3\%2.xml -echo ^ >> %3\%2.xml -goto end: - -:end diff --git a/tests/auto/autobuildtests.bat b/tests/auto/autobuildtests.bat deleted file mode 100644 index 55ffad7..0000000 --- a/tests/auto/autobuildtests.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -REM NOTE: If this script is modified, it is likely that next automatic test will fail horribly, -REM unless manual pull from repository is done before running it. - - -REM Sync git -cd ..\..\ -call git clean -dfx -//call git reset --hard -call git pull - - -REM Auto tests builder -REM 1. argument is enviroment: wincw, armv5 or gcce -REM 2. argument is result's path: like \autotestResults -REM 3. argument is path to pscp.exe: like c:\ - -call tests\auto\autobuildtestsmain.bat %1 %2 %3 - diff --git a/tests/auto/autobuildtestsmain.bat b/tests/auto/autobuildtestsmain.bat deleted file mode 100644 index 33ccd15..0000000 --- a/tests/auto/autobuildtestsmain.bat +++ /dev/null @@ -1,38 +0,0 @@ -@echo off -SET QTVERSION=4.4.2 - -IF NOT EXIST %2\result\sent MKDIR %2\result\sent - -REM Delete old results -del /Q %2\*.* - -REM Build enviroment -set path=%cd%\bin;%path% -make confclean -configure -cetest -platform win32-mwc -xplatform symbian-abld -openssl-linked -qconfig symbian -call bldmake bldfiles -call abld clean -call abld reallyclean -IF %1 == winscw call abld build winscw udeb -IF %1 == armv5 call abld build armv5 urel -IF %1 == gcce call abld build gcce urel - -REM Build auto tests -cd \qts60\tests\auto -for %%i in (QtCore QtGui QtNetwork QtXml QtSvg QtScript) do call compilecategory.bat _Categories\%%i.txt %1 - - -REM run auto tests -cd \qts60\tests\auto -for %%i in (QtCore QtGui QtNetwork QtXml QtSvg QtScript) do call autobuildruncategory.bat _Categories\%%i.txt %1 %2 %QTVERSION% - -REM Collect test results -cd \qts60\tests\auto -echo call python joinresults.py %1 %2 %QTVERSION% -call python joinresults.py %1 %2 %QTVERSION% - -REM send the result file -call %3pscp.exe -i "%USERPROFILE%\.ssh\puttyssh.ppk" %2\Result\*.xml qtestmaster@kramer-nokia.troll.no:/home/qtestmaster/results - -REM Copy the result file to different directory that it not sent again -move %2\Result\*.xml %2\Result\sent diff --git a/tests/auto/compilecategory.bat b/tests/auto/compilecategory.bat deleted file mode 100644 index 59e31b5..0000000 --- a/tests/auto/compilecategory.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM Compile all test cases from given gategory file - -FOR /F "eol=# tokens=1*" %%i in (%1) do CALL compilesingle.bat %%i %2 diff --git a/tests/auto/compilesingle.bat b/tests/auto/compilesingle.bat deleted file mode 100644 index a9bb5f4..0000000 --- a/tests/auto/compilesingle.bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off -REM Compile test case from folder as a parameter - -pushd . -cd %1 -REM call abld reallyclean -call qmake -r -call bldmake bldfiles - -REM reallyclean is not always deleting executables for some reason, so do that explicitly before building - -IF %2 == winscw ( -call abld reallyclean winscw -call del /q /f \epoc32\release\winscw\udeb\tst_%1.exe -call abld build winscw udeb -) -IF %2 == armv5 ( -call abld reallyclean armv5 -call del /q /f \epoc32\release\armv5\urel\tst_%1.exe -call abld build armv5 urel -) -IF %2 == gcce ( -call abld reallyclean gcce -call del /q /f \epoc32\release\gcce\urel\tst_%1.exe -call abld build gcce urel -) - -popd \ No newline at end of file -- cgit v0.12