summaryrefslogtreecommitdiff
path: root/tests/testcurl.pl
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2010-03-25 13:44:13 +0100
committerDaniel Stenberg <daniel@haxx.se>2010-03-25 13:44:13 +0100
commitefcf372d862f92133b6f466dd52251ec4f147465 (patch)
treee55931e4f34b6e7e3a510fca889fd1c1b020d00b /tests/testcurl.pl
parent675330b8dfd3e62c6748de0ebeab4a2d32affcf6 (diff)
downloadcurl-efcf372d862f92133b6f466dd52251ec4f147465.tar.gz
don't touch ares/aclocal.m4 and show recent git commits
since c-ares no longer embedded, we must not touch such files anymore we show the 5 last git commits if git was proven in use, to help us see exactly what's being tested
Diffstat (limited to 'tests/testcurl.pl')
-rwxr-xr-xtests/testcurl.pl13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index e0f3b9a7b..e6026dd62 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -374,11 +374,6 @@ chdir $CURLDIR;
# Do the git thing, or not...
if ($git) {
- # this is a temporary fix to make things work again, remove later
- logit "remove ares/aclocal.m4";
- unlink "ares/aclocal.m4";
-
- logit "update from git";
my $cvsstat;
sub gitpull() {
@@ -388,6 +383,7 @@ if ($git) {
return 1;
}
else {
+
logit "run git pull";
system("git pull 2>&1");
}
@@ -405,6 +401,13 @@ if ($git) {
elsif (!$nogitpull) {
# Set timestamp to the UTC the git update took place.
$timestamp = scalar(gmtime)." UTC";
+
+ # get the last 5 commits for show
+ my @commits=`git log --oneline -5`;
+ logit "The most recent git commits:";
+ for my $l (@commits) {
+ logit " $l";
+ }
}
if($nobuildconf) {