AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use abs_path on input arguments

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-04-20 17:00:30 +02:00
parent 107aeb870b
commit 208184071e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/qtmodule-configtests
View File

@ -57,7 +57,6 @@ use File::Path 'mkpath';
use File::Spec::Functions qw/ :ALL /; use File::Spec::Functions qw/ :ALL /;
use File::Temp qw/ :POSIX /; use File::Temp qw/ :POSIX /;
use Cwd; use Cwd;
use Cwd 'abs_path';
use Config; use Config;
# Which file to look for the %configtests variable in # Which file to look for the %configtests variable in
@ -77,9 +76,8 @@ my $generator = $ARGV[3];
our %configtests; our %configtests;
my $absOutDir = abs_path($out_basedir); my $qmakeCachePath = catfile($out_basedir, '.qmake.cache');
my $qmakeCachePath = catfile($absOutDir, '.qmake.cache'); my $configLogPath = catfile($out_basedir, 'config.log');
my $configLogPath = catfile($absOutDir, 'config.log');
my $QMAKE = catfile($qtbasedir, "bin", ($^O =~ /win32/i) ? 'qmake.exe' : 'qmake'); my $QMAKE = catfile($qtbasedir, "bin", ($^O =~ /win32/i) ? 'qmake.exe' : 'qmake');
if (!-x $QMAKE) { if (!-x $QMAKE) {
@ -241,13 +239,13 @@ sub executeTest {
my @QMAKEARGS = ('CONFIG-=debug_and_release', 'CONFIG-=app_bundle'); my @QMAKEARGS = ('CONFIG-=debug_and_release', 'CONFIG-=app_bundle');
my $testOutDir = catdir($absOutDir, 'config.tests', $testName); my $testOutDir = catdir($out_basedir, 'config.tests', $testName);
# Since we might be cross compiling, look for barename (Linux) and .exe (Win32/Symbian) # Since we might be cross compiling, look for barename (Linux) and .exe (Win32/Symbian)
my $testOutFile1 = catfile($testOutDir, "$testName.exe"); my $testOutFile1 = catfile($testOutDir, "$testName.exe");
my $testOutFile2 = catfile($testOutDir, $testName); my $testOutFile2 = catfile($testOutDir, $testName);
if (abs_path($basedir) eq abs_path($out_basedir)) { if ($basedir eq $out_basedir) {
chdir $testOutDir or die "\nUnable to change to config test directory ($testOutDir): $!\n"; chdir $testOutDir or die "\nUnable to change to config test directory ($testOutDir): $!\n";
} else { # shadow build } else { # shadow build
if (! -e $testOutDir) { if (! -e $testOutDir) {
@ -315,7 +313,7 @@ loadConfigTests();
# Only do this step for modules that have config tests # Only do this step for modules that have config tests
# (qtbase doesn't). We try to preserve existing contents (and furthermore # (qtbase doesn't). We try to preserve existing contents (and furthermore
# only write to .qmake.cache if the tests change) # only write to .qmake.cache if the tests change)
if (abs_path($out_basedir) ne abs_path($qtbasedir)) { if ($out_basedir ne $qtbasedir) {
# Read any existing content # Read any existing content
my $existingContents = fileContents($qmakeCachePath); my $existingContents = fileContents($qmakeCachePath);
my %oldTestResults; my %oldTestResults;