Commit Graph

16 Commits

Author SHA1 Message Date
Oswald Buddenhagen
208184071e don't use abs_path on input arguments
for one, the input paths are already absolute.
second, if a path does not exists, abs_path will fail, which makes the
fallback code which tries to create them rather pointless.

Change-Id: Ie56ff09313e48e82e8bc8e8f06eca384644de464
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-06-19 16:39:53 +02:00
Girish Ramakrishnan
1e13160a00 Fix qtmodule-configtests to honor error codes
The test is marked as fail if qmake or make fails.

Change-Id: I565c68af4a9271d7aa36fb592ac399aa728ba4d8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
2012-03-08 23:52:34 +01:00
Jason McDonald
5635823e17 Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: I311e001373776812699d6efc045b5f742890c689
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-30 03:54:59 +01:00
Friedemann Kleint
1db32565c6 Fixed qtmodule-configtests on Windows.
open() to "|-" and "-|" are unsupported on Windows (see `perldoc
perlport'), so don't do that.

Let the tests write a 'config.log' file which contains the output
of the test commands.

Brings back the part fixing the pipe logic from commit
f865dc1ae4 which was reverted.

Change-Id: I5060a0885702d925001b98f2d4e84743d6ff226e
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2012-01-23 11:02:18 +01:00
Jason McDonald
629d6eda5c Update contact information in license headers.
Replace Nokia contact email address with Qt Project website.

Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-23 04:04:33 +01:00
Kalle Lehtonen
1c53694a17 Revert "Fixed qtmodule-configtests on Windows"
This reverts commit bb4caf3c4937418ca0e33d60cf0b25d6cfc3ea95

Change-Id: I25a9e45c9fa0953bdfe1bc112bf45341802c020d
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-01-13 04:03:59 +01:00
Friedemann Kleint
f865dc1ae4 Fixed qtmodule-configtests on Windows
open to "|-" and "-|" are unsupported on Windows (see `perldoc
perlport'), so don't do that.

Rather than parsing the output of make to decide if a config test is
skipped, use a looser definition: it is skipped if qmake and make both
succeed, but no binary is created.

Change-Id: Idab7266888e9c934aa7b5c1c6ac5930439681107
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-12 16:43:37 +01:00
Jason McDonald
1fdfc2abfe Update copyright year in license headers.
Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-05 06:36:56 +01:00
Tor Arne Vestbø
5f17c41a25 Fix config tests for modules on Mac OS X
We look for a regular binary, but Mac OS X produces application bundles
by default. Instead of looking for an app bundle as well, we unify things
a bit by disabling app bundles instead.

Change-Id: I5eb173d98e893e616f23b91f13282cf95ef4f56a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-14 23:42:17 +01:00
Jason McDonald
5e10745dca Fix missing/broken license headers
Change-Id: I54f3ca5979b78f9eec8115cc580c32321859acf6
Reviewed-on: http://codereview.qt-project.org/4514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-13 03:55:26 +02:00
Aaron McCarthy
0bcb2262d0 Partially revert 25a0cf881e
After the regexs in qtmodule-tests were fixed in the same commit it is
no longer necessary to explicitly add the include statement.  Any
existing content unrelated to config tests is preserved.

Change-Id: I90bab6b838191f050204992aa45262212b937059
Reviewed-on: http://codereview.qt.nokia.com/4296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-07 07:17:08 +02:00
Aaron McCarthy
25a0cf881e Fix inclusion of .qmake.cache for modules with config tests.
Qt modules with config tests generate a module level .qmake.cache with
the results of the config tests.  The existance of this file prevents
qmake from walking up the directory tree and finding the Qt global
cache file.  This results in the system build not working as expected.
For example running 'make' in the module would only build the contents
of src and skip tests and examples.

Fixed by adding a include statement to the end of the config test
generated .qmake.cache.

Change-Id: I68a5f2a96f4ee02076b6457ae085f45d894cd4ed
Reviewed-on: http://codereview.qt.nokia.com/3830
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-01 05:36:26 +02:00
Michael Goddard
c478ebc914 Don't use the // operator, since some versions of Perl don't have it.
Could use || but it's only used for an if test anyway.

Change-Id: I97fe251ab4f27fb75981af12316aaf5da053d47a
Reviewed-on: http://codereview.qt.nokia.com/3431
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-26 02:22:09 +02:00
Michael Goddard
ca3120aa20 Don't print the "Configuration tests:" header if there aren't any.
Change-Id: Ie7f0022348aba90e240f5b68e838430ec4e43ae9
Reviewed-on: http://codereview.qt.nokia.com/2228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-10 10:39:52 +02:00
Michael Goddard
d55aa1ad2a Tighten up the config test success checking.
Try a lot harder to remove the old $TARGET output, since make
clean isn't sufficient.  Also fix a bug in program invocation
that was hidden because of the stale files.

Change-Id: I0a365409d81efb74c5836eaf9f129fd9b2cca77e
Reviewed-on: http://codereview.qt.nokia.com/2052
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-07-26 13:40:07 +02:00
Michael Goddard
997b2a96c1 Add rudimentary config.test support when configuring modules.
An extra script is added (qtmodule-configtests) which is currently
invoked from syncqt (with some derived parameters passed to it).

The module can optionally have an entry in the module's sync.profile
file in the form of a perl map of "test name" => parameters.  Tests
can print an advisory message if they fail (e.g. "Install this
SDK/dev package"), or abort the syncqt process (e.g. mandatory
prereq missing).  Also, if the test has a "requires(foo)" line
that results in it being skipped, this is also supported.

Change-Id: Ic3c820a488a0992c944994d4d7dc283da36742d6
Reviewed-on: http://codereview.qt.nokia.com/928
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-22 14:59:08 +02:00