aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Blacklist tests to get COIN passingmaya2Friedemann Kleint2017-04-061-0/+5
| | | | | | | Task-number: PYSIDE-431 Task-number: PYSIDE-452 Change-Id: I52519ccd9bb19448910a1741abee80fd3cbcc859 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add version 5.6 and make it defaultFriedemann Kleint2017-04-051-1/+8
| | | | | Change-Id: I323c5f69ee4ba1b1c04addd2eeb9a4a76b99a54c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* testrunner.py: Add default value for blacklistFriedemann Kleint2017-03-291-1/+3
| | | | | | | Saves some typing and makes COIN integration easier. Change-Id: Ic7b302157dd5b53388ccc7b89f70db5635bb3ba8 Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Create a tracking branch for version unless it existsFriedemann Kleint2017-03-201-1/+11
| | | | | Change-Id: Ie7832668e0a4adf4dcbf78e49c2af4b65ebe5107 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Remove blacklisting of some tests affected by QTextStream failuresFriedemann Kleint2017-03-161-16/+0
| | | | | | Task-number: PYSIDE-332 Change-Id: If4330d9ffeb3bba0dc016f9ad5de18ef42fea273 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Fix output of testrunner.py and remove ’six’Christian Tismer2017-03-131-3/+3
| | | | | | | | | There is a small error that reports the wrong total number of changes. Furthermore, the dependency of the six modure could be removed by a single line. Change-Id: I510eab49ae3b9c5c36a7ae31a982334fda18567d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix prepare_coin_sources.py on winSimo Fält2017-03-101-2/+5
| | | | | | | | "run_process_output" tends to crash on win, so using standard subprocess.check_output instead. Change-Id: Ibb3cc200558175a25cb580ddc13e6c0e7fc918c4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* update: bring repositories back in syncChristian Tismer2017-02-152-21/+33
| | | | | | | From time to time, it is good to update the master project. Change-Id: I50c45caf7c37ebb4ea865b4e4f5896e5cd8915fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix testrunner command “getcwd”Christian Tismer2017-02-101-2/+2
| | | | | | | | | | | The testrunner.py script was generalisation to allow to select older build versions. (This feature is not ready and in most cases it makes only sense when comparing python 2 and 3.) I had a wrong argument in “getcwd”. Fixed. Change-Id: Ic948a5a6649535bd6ad3d23bbc846f03bde82de0 Reviewed-by: Simo Fält <simo.falt@qt.io>
* blacklist: static_metaobject_test.py worksChristian Tismer2017-02-081-4/+0
| | | | | | | | | | The blacklisted ‘static_metaobject_test’ suddenly works, when ’@Slot()’ is added. So we don’t need to blacklist it any longer. But we should find out, why the test didn’t work _before_ in the first place. Task-number: PYSIDE-315 Change-Id: I343f248dabf334df09948073028ff1cd7c72c8a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* blacklist: qstandarditemmodel_test.py worksChristian Tismer2017-02-081-4/+0
| | | | | | | | | The blacklisted ‘qstandarditemmodel_test’ works now. The path settings are weird during the tests, so that I had to find out how to find shiboken during testing. Now it works. Change-Id: Ib064e93bd8f78da74f2db01255eb1efcb3704a56 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Support python 3.6Christian Tismer2017-02-071-2/+3
| | | | | | | | The necessary support for python 3.6 is just changing the setup.py file. Task-number: PYSIDE-471 Change-Id: Id5c0ad67d1bb9d360f333a415bed65e62c30b53e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add explanatory comment to repository checkFriedemann Kleint2017-02-071-0/+1
| | | | | | | Amends change b97da3efa0462a4de6ae20904dde3843bc18bce2. Change-Id: I8a48aa0d313f370f3933ff699ec2ed347f760e8b Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Check whether files are present in a submoduleFriedemann Kleint2017-01-121-1/+1
| | | | | | | | | | Calling setup.py to initialize the submodules from scratch would fail complaining about the missing 'master' branch in 'wiki', since it assumed the submodules were initialized if the directory was present. Check the directory contents instead. Change-Id: I577a97d8cacf408f7caf52565e13e88815475a3b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* prepare_coin_sources: Use dev branch as a default branchSimo Fält2017-01-121-3/+10
| | | | | | | | Use dev branch if given --branch option contains not existing branch. Change-Id: I21b0a1b9007407f30f899091de5a859fac0059f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update blacklistFriedemann Kleint2017-01-041-26/+6
| | | | | | | | | Remove entries that show BPASS. Add QtQml::bug_451. Task-number: PYSIDE-431 Change-Id: I4520e0c061df34c5a4d5a644bd8dd50154ee5de2 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Initializing pyside submodules when building with Qt CISimo Fält2016-12-191-0/+127
| | | | | | | | | | | | To be able to test changes to pyside-setup submodules with Qt CI, we have to set-up the source package ourself. This script will do necessary changes to sources so that test is executed in proper context. Change-Id: I681be6b9d4a9d1fb100b1fb88ba5791f3f44200e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* Enable testrunner for other projectsChristian Tismer2016-12-151-35/+65
| | | | | | | | | | | | | | | | | | | | Testrunner did only run the pyside2 tests. This new version also allows to specify the projects “shiboken2” and “pyside2-tools”. Now multiple tests can be specified. Interesting: All shiboken2 tests succeed, all pyside2-tools tests fail. Update: the pyside-tools tests work too, but the setup does not work automatically, yet. A “make” must be run in the pyside2-tools directory, and “pyside2-rcc -o example_rc.py example.qrc” must be run in order to generate a resource file. The tests are run according to a list. The default is currently “—projects=shiboken2 pyside2”. Change-Id: I69f08402de0956098aaca5553f98ce50cbf6eae5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* testrunner.py: Use 'linux' as classifier instead of legacy 'linux2'Friedemann Kleint2016-12-132-24/+26
| | | | | | | | | Python 2.X returns 'linux2' as platform for compatibility reasons regardless of the kernel version whereas Python 3.3 onwards returns 'linux'. Fixes blacklisting to work with newer versions of Python. Change-Id: I1d3fd72feaa42bd5c89fa10a9a73474a92a6ab53 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Update the pyside-setup submodulesChristian Tismer2016-12-123-25/+21
| | | | | | | | | | From time to time, submodules need to be updated. Actually, I would even like to update the master module after every submodule checkin, but this seems to be not easy to do all the time. Change-Id: I52f266c58086186df05ddcc85085f35e2e28ead7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* testrunner.py: Allow character '-' in test namesFriedemann Kleint2016-11-291-2/+2
| | | | | | | | | | | | | | | The script was mistakenly reporting FAIL : QtCore::bug_PYSIDE() for FAIL : QtCore::bug_PYSIDE-164() Fix by extending the regular expression. Change-Id: Id6ca4c75489bd577e25723efd62840f714e67ae4 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Support multiple builds in testrunner.pyChristian Tismer2016-11-241-23/+51
| | | | | | | | | | | | | | | | | | The testrunner module allowed only the last build to be tested. This patch allows to specify an arbitrary test index. The default is -1, which gives the normal behavior. The argument ‘—buildno’ specifies which build is to be selected. Note that multiple builds with the same directory are not valid, because the latest entry always overwrites the older ones. But for different configurations this makes sense. The default runtime was set to 600 s. Change-Id: Ib5b33a09dc0af7e36230ca4eba3c21c8970d8212 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Set the minimum Python3 to 3.3Christian Tismer2016-11-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | This was not really set. The setup supported 3.2, the default was saying 3.4, and I have set it now to 3.3. Reason: Besides a sensible useful minimum version, Python 3.3.3 is the only currently working version, which allows for a debug python build on macOS. I need this for my debugging work, admittedly. So this change is really made to support PYSIDE-79. Victor Stinner has supplied a patch three years ago, see https://mail.python.org/pipermail/python-bugs-list/2013-July/209044.html Since then, the patch was not maintained, and the problem has crept into python, again. If I find some time for it, then I will fix it. Task-number: PYSIDE-79 Change-Id: I1b7d4ff1613d31567095636edc61f4222fad08dd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Accept more errors in "testrunner.py"Christian Tismer2016-11-032-26/+11
| | | | | | | | Testrunner has even more variable texts to recognize. We change the regex slightly so that it always succeeds. Change-Id: Iac156592aac48afb5aea522540ae63c92ca2572a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove QML tests from black listsAlexandru Croitor2016-10-211-60/+0
| | | | | Change-Id: Ia33affd98544e169ce63c0753429b6fc447822ff Reviewed-by: Christian Tismer <tismer@stackless.com>
* Make paths absolute in setup.pyChristian Tismer2016-10-182-2/+16
| | | | | | | | | | | | | | | The paths for "qmake" and "cmake" will not work when they are relative paths. This problem is pretty subtle, when setup.py breaks because it cannot create the simple list at line 712, variable "cmake_cmd". This innocent looking list is causing problems, because it uses qtinfo.py, and this is dependent on properties which call back into the subprocess module! The properties in qtinfo.py are now real properties, because their values are early computed in __init__. The problem is solved by this patch. Change-Id: I877b6644fa2909ca9ac1f23d4ce5accfc869716b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup: Add QT_SRC_DIR variableFriedemann Kleint2016-10-141-0/+10
| | | | | | | | | Presence of the variable enables the generation of the doc targets in PySide2. Task-number: PYSIDE-363 Change-Id: I0e1d4702da297f2390f09f9354c413da24febee1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add header for LGPLFriedemann Kleint2016-10-141-0/+39
| | | | | | | | | | | The header is required to satisfy the license checker when running against qtbase 5.6. The change might need to be reverted for 5.7 and higher. Task-number: PYSIDE-431 Change-Id: I1c662040a055c8451fdd66339cd8eb72594a198f Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Simo Fält <simo.falt@theqtcompany.com>
* Add licenses for submodulesFriedemann Kleint2016-10-149-0/+4333
| | | | | | Task-number: PYSIDE-431 Change-Id: Ic2fea5d524c6bee86eae4616968df5b2a5a6b942 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix licenses of setup.py testrunner.pyFriedemann Kleint2016-10-122-19/+77
| | | | | Change-Id: I049929e2c4e24554866000df5daa063071060884 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* fix testing with filtering on real CIChristian Tismer2016-09-302-9/+33
| | | | | | | | | | | | | | | There are a couple of effects when running testrunner.py in real life. Fix: It reports success when there are no tests found. Fix and extend the recognition of relative paths. Add a "getcwd" sub-command to get external access to the build folder. The make command uses no longer "-C" for easier environ access. Change-Id: Iee2f81ed762b9773021055d26f9b144c31acbe35 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Build shiboken with documentation generator by defaultFriedemann Kleint2016-09-281-1/+0
| | | | | Change-Id: I7ebf94d93ce5125deadf103bb4354e54079a372b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* support pyside CI testing with filteringChristian Tismer2016-09-224-0/+890
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PySide is currently in an unfinished state. Therefore, running all the tests will never return a success. To make this more useful, this script is controlled by a blacklist, in order to keep record of the known-to-fail tests. On success: zero error status On Failure: nonzero (raises ValueError) The test parser uses a blacklist file that is compatible to standard Qt blacklist files. macOS, Ubuntu and windows (thanks to fkleint) are supported. The blacklist has a feature where new configurations are learned. It first removes old versions of the same tests, before it inserts the new ones. Blacklisting is now optional. We support now py2, py3, qt5, qt5.6 etc. Some consideration about collapsing the data are added. The parser has now a sub-command "test" that is mandatory. Support for moving the build_dir to another location without loosing the tests so far. Implement BPASS. Support CTEST_OUTPUT_ON_FAILURE Change-Id: If66d3cf1733a3b0c8a47fe9b8c6aec8ea430c699 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix retrieving VIRTUALENV variableFriedemann Kleint2016-09-221-1/+1
| | | | | | | | Use get() with default value. Amends 8b484df1cf36cbf43192bc1e4669b5e3dcb591e7. Change-Id: I728747e2de1ef9878a7a7698ec701055fcf18363 Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Prefix build/install directories by virtualenv nameFriedemann Kleint2016-09-211-2/+10
| | | | | | | | | | Use testenv_name_build/testenv_name_install instead of pyside_build_install when a virtual environment exists. This makes it easier to maintain builds in varying environments in parallel for comparing things. Change-Id: I33f672a24d871ccb8c9aad1614b7b3eded33b93c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix run_process_output to work with Python 3Alexandru Croitor2016-09-201-1/+1
| | | | | | | | Strings are already encoded as utf8, so there is no need to call decode on them. Change-Id: Idfaaa5f5092fb6010ea64b7abf754d7b343d07e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup.py: Make prepareSubModules() a bit smarterFriedemann Kleint2016-09-162-14/+45
| | | | | | | | | | | | Avoid unnecessarily re-initializing the submodules and checking out branches. In a first loop, collect the subdirectories and check whether any are missing. Initialize submodules only in that case. In the second loop, check out the correct branch if it differs. Change-Id: I3c16fd9b7bd6feb77b7b921d61f7e622cfab797f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Improve finding the respective make tool on WindowsFriedemann Kleint2016-09-151-11/+10
| | | | | | | | | Check whether nmake can actually be found. Invert option --jom to --no-jom so that jom is used by default. As options are not checked, --jom will then be simply ignored. Change-Id: I67bd7f92d3bb2800530847abe0808283ca14d8a4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Add completion messages to build and installFriedemann Kleint2016-09-121-0/+2
| | | | | | | | It is sometimes hard to tell whether the build finished successfully, add a message to show it. Change-Id: If9a20272f851fbe0ade801ddab1bee11fca807da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Restructure setup.pyFriedemann Kleint2016-09-121-16/+27
| | | | | | | | | | | | | | | Move all code that was unconditionally executed at startup into a subroutine prepareBuild() and execute that from the build command class. Overwrite the Distutils'_install to be extended. This makes the standard --help options of DistUtils work as expected and causes the script to require a command argument instead of starting unconditionally. Change-Id: I0bf1bfc4ba0e15662122733b04e468f1838e4ae8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Fix checking for qmake/cmake binariesFriedemann Kleint2016-09-121-1/+15
| | | | | | | Verify that the commands exist. Change-Id: I8a4263320774f151848f68b04bc7b4447afe2579 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Let OPTION_REUSE_BUILD imply OPTION_IGNOREGITFriedemann Kleint2016-09-121-1/+1
| | | | | Change-Id: Id24505e17c39a0e81fab283f04e53923d9f56d6a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* README.md: Fix URLsFriedemann Kleint2016-08-301-3/+3
| | | | | | | Point to the Qt wiki and code.qt.io. Change-Id: I94ab781ae1cccd3fc73ee9dc7a09401b0f28e0e4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Adding sync.profile file for Qt CI usageSimo Fält2016-07-291-0/+19
| | | | | | | Change-Id: Ibe3f461466d043108370682f252865adda3c6b41 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* setup.py: Fix branchesFriedemann Kleint2016-07-261-2/+6
| | | | | | | | | | | | | | | | | - Change the examples to the dev branch - Introduce an optional 3rd parameter to the submodules hash pointing to the directory and use that to switch the wiki module to the master branch. This makes it possible to run commands like git submodule foreach git pull which did not work previously due to the wiki submodule being in a headless state. Change-Id: Ib90f68f73e3401431fd2dce90f02ed75095a5429 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Use new examples repositoryFriedemann Kleint2016-07-041-1/+1
| | | | | Change-Id: I259c93a344ca61ba1a3c71d9eff5f83bc4c2722d Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
* Add various setup.py build options for development convenience.Alexandru Croitor2016-06-201-20/+55
| | | | | | | | | | | | | | | --reuse-build option will rebuild only modified sources, --skip-cmake skips generating new Makefiles, --skip-make-install skips executing make install, --skip-packaging will not create a python package. A combination of these can decrease development iteration time, instead of constantly rebuilding the whole world, or waiting for the packaging to be done, when you are only interested if a certain file compiles. Change-Id: I755f102573dcb37ceb1b835b0843f244c2d4114e Reviewed-by: Christian Tismer <tismer@stackless.com>
* Fix OS/X inclusion of framework headers.Alexandru Croitor2016-06-163-16/+51
| | | | | | | | | | | | | | | | | | | | | The recent change that made use of framework headers on OS/X did not work with homebrew Qt, and it didn't work with official builds either, because neither of the chosen include folders contained all the necessary headers to lead to a successful build. Fortunately shiboken actually supports being passed multiple include locations, separated by a colon on OS/X, and a semicolon on Windows. This patch makes sure to always pass the Qt include folder, and in case if the Qt build is a framework build, also passes the root frameworks location, with headers found by shiboken under frameworkName.framewework/Headers. This works for homebrew builds, official builds and custom non-installed prefix / in-source builds of Qt. Change-Id: I47b24e197839883de2ab873461efc1f4d4d33743 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Include Qt framework headers in osxSimo Fält2016-06-031-1/+5
| | | | | | | | | While using Qt binaries installed with Qt Company installer, pyside can't find header files which are installed to lib/Qt<module>.framework/Headers directory. Change-Id: If74f5b3bf0f139bbcc6e9b62fb16e125f6ca9d4c Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Remove Qt Quick 1 imports folder.Friedemann Kleint2016-06-011-10/+0
| | | | | | | | Qt Quick 1 has been removed in Qt 5.6. Change-Id: I4db96e3a5613d8abe208841752c6ea25e72c4a8e Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Christian Tismer <tismer@stackless.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 02:56:00 +0000