mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-27 05:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

testcurl.pl: always show the last 5 commits even with --nogitpull

Browse Source
This commit is contained in:
Marc Hoersken 2014-01-05 00:09:20 +01:00
parent 5c0eae136b
commit 190bb785d8
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/testcurl.pl
View File

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -400,16 +400,22 @@ chdir $CURLDIR;
# Do the git thing, or not... # Do the git thing, or not...
if ($git) { if ($git) {
my $gitstat = 0;
my @commits;
# update quietly to the latest git # update quietly to the latest git
if($nogitpull) { if($nogitpull) {
logit "skipping git pull (--nogitpull)"; logit "skipping git pull (--nogitpull)";
} else { } else {
my $gitstat = 0;
my @commits;
logit "run git pull in curl"; logit "run git pull in curl";
system("git pull 2>&1"); system("git pull 2>&1");
$gitstat += $?; $gitstat += $?;
logit "failed to update from curl git ($?), continue anyway" if ($?); logit "failed to update from curl git ($?), continue anyway" if ($?);
# Set timestamp to the UTC the git update took place.
$timestamp = scalar(gmtime)." UTC" if (!$gitstat);
}
# get the last 5 commits for show (even if no pull was made) # get the last 5 commits for show (even if no pull was made)
@commits=`git log --pretty=oneline --abbrev-commit -5`; @commits=`git log --pretty=oneline --abbrev-commit -5`;
logit "The most recent curl git commits:"; logit "The most recent curl git commits:";
@ -417,12 +423,22 @@ if ($git) {
chomp ($_); chomp ($_);
logit " $_"; logit " $_";
} }
if (-d "ares/.git") { if (-d "ares/.git") {
chdir "ares"; chdir "ares";
if($nogitpull) {
logit "skipping git pull (--nogitpull) in ares";
} else {
logit "run git pull in ares"; logit "run git pull in ares";
system("git pull 2>&1"); system("git pull 2>&1");
$gitstat += $?; $gitstat += $?;
logit "failed to update from ares git ($?), continue anyway" if ($?); logit "failed to update from ares git ($?), continue anyway" if ($?);
# Set timestamp to the UTC the git update took place.
$timestamp = scalar(gmtime)." UTC" if (!$gitstat);
}
# get the last 5 commits for show (even if no pull was made) # get the last 5 commits for show (even if no pull was made)
@commits=`git log --pretty=oneline --abbrev-commit -5`; @commits=`git log --pretty=oneline --abbrev-commit -5`;
logit "The most recent ares git commits:"; logit "The most recent ares git commits:";
@ -430,11 +446,9 @@ if ($git) {
chomp ($_); chomp ($_);
logit " $_"; logit " $_";
} }
chdir "$pwd/$CURLDIR"; chdir "$pwd/$CURLDIR";
} }
# Set timestamp to the UTC the git update took place.
$timestamp = scalar(gmtime)." UTC" if (!$gitstat);
}
if($nobuildconf) { if($nobuildconf) {
logit "told to not run buildconf"; logit "told to not run buildconf";