Skip to content

Commit d8ec8ed

Browse files
committed
FIx issue with overloads in tests
1 parent b180794 commit d8ec8ed

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/verify-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ jobs:
357357
curl https://libhttpserver.s3.amazonaws.com/travis_stuff/curl-7.75.0.tar.gz -o curl-7.75.0.tar.gz ;
358358
tar -xzf curl-7.75.0.tar.gz ;
359359
cd curl-7.75.0 ;
360-
if [ "$matrix.os-type" = "ubuntu" ]; then ./configure ; else ./configure --with-darwinssl ; fi
360+
./configure --with-darwinssl ;
361361
make ;
362362
if: ${{ matrix.os == 'macos-latest' && steps.cache-CURL.outputs.cache-hit != 'true' }}
363363

@@ -393,20 +393,20 @@ jobs:
393393
id: cache-libmicrohttpd
394394
uses: actions/cache@v4
395395
with:
396-
path: libmicrohttpd-0.9.64
397-
key: ${{ matrix.os }}-${{ matrix.c-compiler }}-libmicrohttpd-pre-built
396+
path: libmicrohttpd-0.9.77
397+
key: ${{ matrix.os }}-${{ matrix.c-compiler }}-libmicrohttpd-0.9.77-pre-built
398398

399399
- name: Build libmicrohttpd dependency (if not cached)
400400
run: |
401-
curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.64.tar.gz -o libmicrohttpd-0.9.64.tar.gz ;
402-
tar -xzf libmicrohttpd-0.9.64.tar.gz ;
403-
cd libmicrohttpd-0.9.64 ;
401+
curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.77.tar.gz -o libmicrohttpd-0.9.77.tar.gz ;
402+
tar -xzf libmicrohttpd-0.9.77.tar.gz ;
403+
cd libmicrohttpd-0.9.77 ;
404404
./configure --disable-examples ;
405405
make ;
406406
if: steps.cache-libmicrohttpd.outputs.cache-hit != 'true'
407-
407+
408408
- name: Install libmicrohttpd
409-
run: cd libmicrohttpd-0.9.64 ; sudo make install ;
409+
run: cd libmicrohttpd-0.9.77 ; sudo make install ;
410410

411411
- name: Refresh links to shared libs
412412
run: sudo ldconfig ;
@@ -426,7 +426,7 @@ jobs:
426426
if [ "$BUILD_TYPE" = "ubsan" ]; then export export CFLAGS='-fsanitize=undefined'; export CXXLAGS='-fsanitize=undefined'; export LDFLAGS='-fsanitize=undefined'; fi
427427
428428
# Additional flags on mac. They need to stay in step as env variables don't propagate across steps.
429-
if [ "$matrix.os" = "macos-latest" ]; then
429+
if [ "${{ matrix.os }}" = "macos-latest" ]; then
430430
export CFLAGS='-mtune=generic' ;
431431
export IPV6_TESTS_ENABLED="true" ;
432432
fi

test/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ nodelay_SOURCES = integ/nodelay.cpp
3737
http_resource_SOURCES = unit/http_resource_test.cpp
3838

3939
noinst_HEADERS = littletest.hpp
40-
AM_CXXFLAGS += -lcurl -Wall -fPIC
40+
AM_CXXFLAGS += -lcurl -Wall -fPIC -Wno-overloaded-virtual
4141

4242
if HAVE_GNUTLS
4343
AM_CXXFLAGS += -lgnutls

0 commit comments

Comments
 (0)