summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix compound defined() preprocessor expressionHEADmasterJoerg Bornemann2024-02-021-0/+1
| | | | | | | | | | | | | | | | Expressions like !if defined(foo) && defined(bar) checked for the existence of the macro "foo) && defined(bar" due to an overly greedy regular expression in the lexer of the preprocessor. NMake macro names cannot contain parentheses, so we can change the regex to not eat the closing parenthesis. The lexer was regenerated with flex 2.6.4. Fixes: QTCREATORBUG-24134 Change-Id: I0e5f4f5b5603cf1d2a53ad6ff9224e18e5649a7d Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Do not depend on QtGui in testsJoerg Bornemann2023-08-101-1/+1
| | | | | Change-Id: I5abc561276d95d6ab433be9d5cd741e3bdb95114 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix handling of macro definitions on command lineJoerg Bornemann2019-03-253-2/+80
| | | | | | | | | | | | Setting a variable FooBar=2 on the command line explicitly defines the macro FooBar, but also implicitly defines the macro FOOBAR. Explicitly set macros are not overridden. The first definition wins. Implicitly set macros are overridden. The last definition wins. Fixes: QTCREATORBUG-22176 Change-Id: I5324ba20295a1fade5e98302d698a826400fa80c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Do not yield an error if there are no targets in the MakefileJoerg Bornemann2019-03-253-0/+10
| | | | | | | NMake allows Makefiles without targets and exits with code 0. Change-Id: If6ab21f7bd4ee640b7d1b7499fe9a3e34abef4b0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix handling of a double backslash at the end of lineJoerg Bornemann2018-12-062-0/+2
| | | | | | | | The double backslash at EOL shall not be altered. Task-number: QTCREATORBUG-20550 Change-Id: Ib4cc73da7a6634233d222945f01dd7974d112971 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix line continuations for preprocessor directivesJoerg Bornemann2018-12-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | Line continuations in preprocessor directives are now handled correctly such that assignments like the following are possible: VAR=foo\ !IF 1 bar\ !EL\ SE baz\ !ENDIF zap which evaluates to VAR=foo bar zap Task-number: QTCREATORBUG-8621 Task-number: QTCREATORBUG-18001 Change-Id: I3f86c6e3b13cbc04451fcfb267c5c43946b8e85c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Split CMakeLists.txtJoerg Bornemann2018-11-201-0/+11
| | | | | | | | Do not use one monolithic file for the whole of jom. Also, modernize the project files. Change-Id: Iea764aa40bfa6f0064d864521a0726ca107df486 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix "build unrelated targets on error" modeJoerg Bornemann2016-11-143-3/+44
| | | | | | | | | | With the /k option given, jom tried to build all targets, even targets that depended on failed targets. Thus it behaved the same as /i (ignore exit codes), which is wrong. Task-number: QTCREATORBUG-17131 Change-Id: I1dcbabbf423042de44222a600f7a1b8be1203f45 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix wildcard handling for subdirsJoerg Bornemann2016-06-272-0/+8
| | | | | | Task-number: QTCREATORBUG-16499 Change-Id: I262a9f6a6b0e900f8d53dda417ae26b964bd7609 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* update license headersJoerg Bornemann2016-02-111-18/+23
| | | | | Change-Id: I27221473bc0f0fa93bbd738d96de44e47489b677 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Fix glitches in !include directiveJoerg Bornemann2016-01-185-0/+10
| | | | | | | | | Includes like <"foo.mk"> were not possible. Includes like "foo.mk" did not recursively search through parent makefiles directories. Change-Id: I20daccae52c5af83a98ec2b95522a4ac03a99ddd Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Make use of QFINDTESTDATAJoerg Bornemann2016-01-062-2/+1
| | | | | Change-Id: Ic488133a2a41cdc2241280cfa7cbb8ff10ccad2b Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Remove Qt4 vestiges from project filesJoerg Bornemann2016-01-061-1/+0
| | | | | Change-Id: I69ab23fc88273a6e32592403c2e71d911e45e728 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* update license headersJoerg Bornemann2015-04-282-4/+4
| | | | | Change-Id: I5a0d1927d54c4084776f0a4886858406e18795a5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* make test makefiles visible in IDEJoerg Bornemann2015-03-301-0/+1
| | | | | Change-Id: Ia4d54c73904af9254c33257cee5105e06dc2566d Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* fix Tests::environmentVariablesCaseInsensitivity for dynamic buildsJoerg Bornemann2015-03-172-5/+5
| | | | | | | | Do not override the PATH environment variable. Otherwise jom cannot be started in this particular blackbox test when using a non-static Qt. Change-Id: I1a228817886604207335718c564224a7c205de3d Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* allow multiple minus characters before commandsJoerg Bornemann2015-03-171-1/+4
| | | | | | | | All but the first minus before a command are ignored. This is in line with nmake behavior. Change-Id: I8a1bc8f284d36d293cc14ab21fb3ec0ecf26d242 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* fix ignoring exit codes greater than 255Joerg Bornemann2015-03-172-12/+23
| | | | | | | | | Having a command prefixed with - should ignore the exit code. However, only exit codes <= 255 were properly ignored. The exit code type is unsigned int in MSVC land. Change-Id: I352f0f068aaed5afc18081a3125d46eeb5094d44 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* fix $? filename macro for nonexistent targetsJoerg Bornemann2015-03-172-1/+11
| | | | | | Task-number: QTCREATORBUG-14125 Change-Id: I0bf713111816a26e6be12de26d46652da8ab7e8b Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* add missing dependent in filenamemacros.mkJoerg Bornemann2015-03-161-1/+2
| | | | | Change-Id: I43e7b7867b214dbb85cea2585262dfdfd5f86845 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix quoting of dependencies with spacesJoerg Bornemann2014-10-132-6/+12
| | | | | | | | | Always quote file name macro values that contain whitespace, because every file name macro expansion produces a - guess what - file name. Task-number: QTCREATORBUG-12296 Change-Id: I6a0ae25ed7a6f7fdbdfc5b81a3c5aea489ed2b37 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix race condition in Tests::inlineFilesJoerg Bornemann2014-10-132-6/+6
| | | | | | | | | All test targets depend on "init". test_keepFile depends on test_fileRemoval, because both write into post_check.cmd. Change-Id: Ic86d428978878d0e009f7c32360376adaa730c98 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix Tests::inlineFilesJoerg Bornemann2014-10-131-0/+2
| | | | | | | We must run the post_check target to execute all tests. Change-Id: I4021cbe4ef942f89f8d7c54c349a0c7b0ecf993f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* unify license header styleJoerg Bornemann2014-02-071-0/+1
| | | | | Change-Id: Ieb108b969f870cee6aa164df48bb839299e38425 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* unify include guardsJoerg Bornemann2014-02-071-1/+5
| | | | | Change-Id: I3d3f4b7971a77ebec09f462214848d378c3ebf06 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* update license headersJoerg Bornemann2014-01-172-2/+2
| | | | | Change-Id: I4b7044d3b15c96bb12a469084a966a61963f67d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* support globbing in dependency linesJoerg Bornemann2014-01-103-0/+19
| | | | | | Task-number: QTCREATORBUG-10439 Change-Id: I7d12a20441d9f5c6554e8832a14b0233a57da898 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* rename ParserTest classJoerg Bornemann2014-01-102-46/+46
| | | | | | | The tests in here aren't just parser tests. Change-Id: I9d9bc1a08defcacad096c5bb41acbeb6447f0799 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add tests for !IF in assignmentOrgad Shaneh2013-01-242-0/+23
| | | | | | Task-number: QTCREATORBUG-8621 Change-Id: Ibf3f4a2a6e77f49effd1fb969ef9b207ef4cf7d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Validate all conditional testsOrgad Shaneh2013-01-241-0/+2
| | | | | Change-Id: Ie97b814a2d4c9ac870f17d26b3297a3cac2cb8bc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* missing file addedJoerg Bornemann2013-01-041-0/+3
| | | | | Change-Id: I11dcfa1a308d8bda6142f0bfbadb4e5eca4e1428 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix filename macro modifiers for $** and $?Joerg Bornemann2013-01-021-8/+0
| | | | | | | | | | | | | The filename macros $** and $? return lists of values. All of those values must be modified, if a filename modifier is given. getFileNameMacroValue was renamed to getFileNameMacroValues and returns a QStringList. Task-number: QTCREATORBUG-6932 Change-Id: I44108ff45db29e8691bd30315ba8f9a6d5c49f36 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix equal signs in semicolon syntaxJoerg Bornemann2013-01-022-0/+9
| | | | | | | | | The following description block was falsely handled as macro assignment. sometarget: ; echo foo=bar Task-number: QTCREATORBUG-7942 Change-Id: I6dfa4b63854388e179bd43c2789012f0be054141 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* test, whether preprocessor is working in inline filesJoerg Bornemann2013-01-021-0/+2
| | | | | Change-Id: Iccbb130cc8bfe1df264d578eb931d4818a278604 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* update license headersJoerg Bornemann2013-01-022-2/+2
| | | | | Change-Id: I9c86c6534895475129a5e1e099daf72fcf8356fb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix handling of environment variables with lowercase namesJoerg Bornemann2012-11-212-0/+12
| | | | | Change-Id: I7aa179a028b60002f07d8e747ef7d091dd987839 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove m_bResetJomProcessEnvironment member from testJoerg Bornemann2012-11-212-10/+4
| | | | | | | Just clear the environment after every jom run. Change-Id: I9edc5e0fcf84cc6384e85f90b6a6290509197885 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* autotests: ensure existence of QProcess objectJoerg Bornemann2012-11-211-9/+2
| | | | | Change-Id: I93e8fcae0ca51517b0b369fe0750db0f8655cf22 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix typosJoerg Bornemann2012-11-211-2/+2
| | | | | Change-Id: I869675fe187b37f2ff0472d16015176a8e15702d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* ignore environment variables that cause syntax errorsJoerg Bornemann2012-11-211-2/+10
| | | | | | | | | | Having environment variables with invalid macro invokations caused an error. They must be ignored instead. Example: PROMPT=$+$G$_$P Task-number: QTCREATORBUG-8266 Change-Id: Ib8507e9dda38837b55502cc23b15baa269770192 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix non-functional set command in command blocksJoerg Bornemann2012-11-193-0/+13
| | | | | Change-Id: I277a29ffd9ad28f8e988f21114c9152c5845ff92 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix TARGET in tests.proJoerg Bornemann2012-11-191-2/+3
| | | | | | | Be able to run testsd.exe from Qt Creator. Change-Id: I7c3a0fb450cf23a0fc9ffbc98bbf50f269bdd038 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix DEPENDPATH in tests.proJoerg Bornemann2012-11-191-1/+1
| | | | | Change-Id: I513685b99e673e8a42c2a0370da416aba23fe3f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* license headers updatedJoerg Bornemann2012-11-192-10/+4
| | | | | Change-Id: I2a4444e68e0fbd11827ee3aa01794e4c64824d2f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* jom pro files: fix dependenciesJoerg Bornemann2012-09-051-5/+6
| | | | | Change-Id: I3bbd4c15979f7ba53009e457a2b9a83beabd663d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* do not distinguish between quoted and unquoted target namesJoerg Bornemann2012-05-111-21/+3
| | | | | | | | | | | | "targetName": foo and targetName: foo are now considered to be the same target. Even internally. This save us from keeping track of two versions of target names. Change-Id: I0eeb888a8905296b5c32f7930eea33c5c8ae13b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix shadow build of jomJoerg Bornemann2012-03-142-11/+9
| | | | | Change-Id: I288c0d86ba4fde6b4f5db25282041c51aa81ece9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* added QEXPECT_FAILs for file name macros and QTCREATORBUG-6932v1.0.9Joerg Bornemann2012-02-091-0/+8
|
* ParserTest::fileNameMacros fixedJoerg Bornemann2012-02-091-9/+1
|
* include file lookup fixedJoerg Bornemann2012-01-271-1/+1
| | | | Task-number: QTCREATORBUG-6869