From efcf372d862f92133b6f466dd52251ec4f147465 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 25 Mar 2010 13:44:13 +0100 Subject: 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 --- tests/testcurl.pl | 13 ++++++++----- 1 file 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) { -- cgit v1.2.3