From: Tim Duesterhus <tim@bastelstu.be>
Date: Wed, 12 May 2021 19:08:49 +0000 (+0200)
Subject: Revert "CI: Build VTest with clang"
X-Git-Tag: v2.4.0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b38b5c3d0d4df6428ac55499e40ed4ef32ceb405;p=thirdparty%2Fhaproxy.git

Revert "CI: Build VTest with clang"

The issue with VTest not building properly in gcc is fixed since commit
vtest/VTest@0730540c43a2a23436b43f46327d6bac644d816d. Revert the patch to keep
the CI configuration simple.

This reverts commit e61f53eb44a390f9a8c8c4f34077c365942e0729.
---

diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml
index 1d62f98f3a..cb52f27d6f 100644
--- a/.github/workflows/vtest.yml
+++ b/.github/workflows/vtest.yml
@@ -63,7 +63,7 @@ jobs:
         curl -fsSL https://github.com/vtest/VTest/archive/master.tar.gz -o VTest.tar.gz
         mkdir VTest
         tar xvf VTest.tar.gz -C VTest --strip-components=1
-        make -C VTest -j$(nproc) FLAGS="-O2 -s -Wall" CC=clang
+        make -C VTest -j$(nproc) FLAGS="-O2 -s -Wall"
         sudo install -m755 VTest/vtest /usr/local/bin/vtest
     - name: Install SSL ${{ matrix.ssl }}
       if: ${{ matrix.ssl && matrix.ssl != 'stock' }}
diff --git a/.travis.yml b/.travis.yml
index 37b667bc1f..1aa415aa8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ matrix:
 install:
   - git clone https://github.com/VTest/VTest.git ../vtest
   # Special flags due to: https://github.com/vtest/VTest/issues/12
-  - make -C ../vtest FLAGS="-O2 -s -Wall" CC=clang
+  - make -C ../vtest FLAGS="-O2 -s -Wall"
 
 script:
   - make -j$(nproc) ERR=1 TARGET=linux-glibc CC=$CC DEBUG=-DDEBUG_STRICT=1 $FLAGS