changed testcurl script to allow building test harness

programs when cross-compiling for a *-*-mingw* host.
This commit is contained in:
Yang Tse 2009-06-11 01:22:35 +00:00
Родитель 352177090f
Коммит 7edcc22136
2 изменённых файлов: 40 добавлений и 3 удалений

Просмотреть файл

@ -6,6 +6,10 @@
Changelog Changelog
Yang Tse (11 Jun 2009)
- I adapted testcurl script to allow building test harness programs when
cross-compiling for a *-*-mingw* host.
Daniel Stenberg (10 Jun 2009) Daniel Stenberg (10 Jun 2009)
- Fabian Keil ran clang on the (lib)curl code, found a bunch of warnings and - Fabian Keil ran clang on the (lib)curl code, found a bunch of warnings and
contributed a range of patches to fix them. contributed a range of patches to fix them.

Просмотреть файл

@ -228,6 +228,22 @@ sub mydie($){
exit 1; exit 1;
} }
sub get_host_triplet {
my $triplet;
my $configfile = "$pwd/$build/lib/config.h";
if(-f $configfile && -s $configfile && open(LIBCONFIGH, "<$configfile")) {
while(<LIBCONFIGH>) {
if($_ =~ /^\#define\s+OS\s+"*([^"][^"]*)"*\s*/) {
$triplet = $1;
last;
}
}
close(LIBCONFIGH);
}
return $triplet;
}
if (open(F, "$setupfile")) { if (open(F, "$setupfile")) {
while (<F>) { while (<F>) {
if (/(\w+)=(.*)/) { if (/(\w+)=(.*)/) {
@ -683,11 +699,28 @@ if ($configurebuild && !$crosscompile) {
} else { } else {
logit "the tests were successful!"; logit "the tests were successful!";
} }
} else { }
# dummy message to feign success else {
if($crosscompile) { if($crosscompile) {
logit "cross-compiling, can't run tests"; # build test harness programs for selected cross-compiles
my $host_triplet = get_host_triplet();
if($host_triplet =~ /([^-]+)-([^-]+)-mingw(.*)/) {
chdir "$pwd/$build/tests";
logit_spaced "build test harness";
open(F, "$make -i 2>&1 |") or die;
open(LOG, ">$buildlog") or die;
while (<F>) {
s/$pwd//g;
print;
print LOG;
}
close(F);
close(LOG);
chdir "$pwd/$build";
}
logit_spaced "cross-compiling, can't run tests";
} }
# dummy message to feign success
print "TESTDONE: 1 tests out of 0 (dummy message)\n"; print "TESTDONE: 1 tests out of 0 (dummy message)\n";
} }