Skip to content

Commit 912a6da

Browse files
Fix upstream missing USE_TLS macro guard (#242)
* Fix upstream missing USE_TLS macro guard * Added --disable-tls build variation to prevent this issue in the future --------- Co-authored-by: filipecosta90 <[email protected]>
1 parent 77fa029 commit 912a6da

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ name: CI
33
on: [push, pull_request]
44

55
jobs:
6+
build-notls:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Install dependencies
11+
run: |
12+
sudo apt-get -qq update
13+
sudo apt-get install lcov autoconf automake pkg-config libevent-dev libpcre3-dev
14+
15+
- name: Build
16+
run: autoreconf -ivf && ./configure --disable-tls && make -j
17+
618
build-ubuntu:
719
strategy:
820
matrix:

memtier_benchmark.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,10 @@ static void config_init_defaults(struct benchmark_config *cfg)
313313
cfg->hdr_prefix = "";
314314
if (!cfg->print_percentiles.is_defined())
315315
cfg->print_percentiles = config_quantiles("50,99,99.9");
316+
#ifdef USE_TLS
316317
if (!cfg->tls_protocols)
317318
cfg->tls_protocols = REDIS_TLS_PROTO_DEFAULT;
319+
#endif
318320
}
319321

320322
static int generate_random_seed()

0 commit comments

Comments
 (0)