diff options
| author | Ladar Levison <ladar@lavabit.com> | 2022-04-12 20:07:20 +0300 |
|---|---|---|
| committer | Ladar Levison <ladar@lavabit.com> | 2022-04-12 20:07:20 +0300 |
| commit | 0084ae9dd5c568b2892f1434111f48c9c43eb769 (patch) | |
| tree | 85f9790d79afdb090b2e0f94998d306e3dfc4141 | |
| parent | 3e904297ff35922fc49a58fbdb5b319d9c4b7252 (diff) | |
Force libmemcached to always use the bundled daemon binary for unit testing.
| -rwxr-xr-x | dev/scripts/builders/build.lib.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh index d11249e4..1d021e34 100755 --- a/dev/scripts/builders/build.lib.sh +++ b/dev/scripts/builders/build.lib.sh @@ -2305,18 +2305,15 @@ memcached() { # For some reason, the unit tests will fail if this environment variable is configured. unset MEMCACHED_SERVERS - # Find the memcached binary, and configure accordingly. + # Find the memcached binary, and configure accordingly. Since the dump() unit tests will no longer + # pass if the installed memcached is newer than version X.X.X, we simply force libmemcached to use + # the bundled daemon for unit testing. # --enable-memaslap=off # --disable-silent-rules - MEMCACHED_BINARY="`which memcached`" - if [ "$MEMCACHED_BINARY" != "" ]; then - ./configure --disable-dtrace --disable-sasl --enable-static --enable-shared --with-pic \ + # MEMCACHED_BINARY="`which memcached`" + MEMCACHED_BINARY=/dev/null + ./configure --disable-dtrace --disable-sasl --enable-static --enable-shared --with-pic \ --enable-jobserver=no --with-memcached="$MEMCACHED_BINARY" --prefix="$M_LOCAL" &>> "$M_LOGS/memcached.txt"; error - else - ./configure --disable-dtrace --disable-sasl --enable-static --enable-shared --with-pic \ - --enable-jobserver=no --prefix="$M_LOCAL" &>> "$M_LOGS/memcached.txt"; error - fi - unset CFLAGS; unset CXXFLAGS; unset CPPFLAGS; unset LIBS; unset M_EXTRA ; unset MEMCACHED_BINARY make --jobs=${M_JOBS} &>> "$M_LOGS/memcached.txt"; error |