From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Thu, 28 May 2020 09:20:50 +0000 (+0200)
Subject: Prevent extended tests run unexpectedly in appveyor
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3476de9199c1079162399eeb858a8580ef478b18;p=oweals%2Fopenssl.git

Prevent extended tests run unexpectedly in appveyor

Reason turns out that "git log -2" is picking up a merge
commit and a random commit message from the master branch.

Restore the expected behavior by using
git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11981)

(cherry picked from commit d805b83166538907535862372c16ff6ceb648b21)
---

diff --git a/appveyor.yml b/appveyor.yml
index 242d6a9ffe..6210391f20 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -46,7 +46,8 @@ before_build:
     - cd ..
     - ps: >-
         if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER`
-            -or (&git log -2 | Select-String "\[extended tests\]") ) {
+            -or (&git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT |
+                 Select-String "\[extended tests\]") ) {
             $env:EXTENDED_TESTS="yes"
         }