lz4: Remove ancient test helpers

Building lz4 as root was causing `make clean` to fail with permission
errors.

We used to have to install lz4 from source back in Ubuntu 14.04, but
nowadays the installed lz4 is fine. Get rid of ancient helpers and
cruft!

diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index da35ec67556414ed6c321657da1b072ca95622b8..227b01a0cd745600d3d6e8ef0d635dba701a5881 100644 (file)
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -170,7 +170,6 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
     - name: LZ4, thread pool, and libs build testslib wrapper test
       run: |
-        make lz4install
         make -C tests test-lz4
         make check < /dev/null | tee   # mess with lz4 console detection
         make clean

diff --git a/Makefile b/Makefile
index e8e6bcffe4eaa51895922d0bbe60bed7bf582f70..c9a640cbafa35876e464be77af7613ac24a4efe8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,7 @@ apt-add-repo:
        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
        sudo apt-get update -y -qq
 
-.PHONY: ppcinstall arminstall valgrindinstall libc6install gcc6install gcc7install gcc8install gpp6install clang38install lz4install
+.PHONY: ppcinstall arminstall valgrindinstall libc6install gcc6install gcc7install gcc8install gpp6install clang38install
 ppcinstall:
        APT_PACKAGES="qemu-system-ppc qemu-user-static gcc-powerpc-linux-gnu" $(MAKE) apt-install
 
@@ -379,10 +379,6 @@ gpp6install: apt-add-repo
 clang38install:
        APT_PACKAGES="clang-3.8" $(MAKE) apt-install
 
-# Ubuntu 14.04 ships a too-old lz4
-lz4install:
-       [ -e lz4 ] || git clone https://github.com/lz4/lz4 && sudo $(MAKE) -C lz4 install
-
 endif
 
 

diff --git a/tests/Makefile b/tests/Makefile
index b96986cae5e10df7f3f579c8f47d8b7e48dbf155..643f8cd611980b22ec23a12deaa87bcc5d7f8ae2 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -447,9 +447,9 @@ test-decodecorpus-cli: decodecorpus
 test-pool: poolTests
        $(QEMU_SYS) ./poolTests
 
-test-lz4: ZSTD = LD_LIBRARY_PATH=/usr/local/lib $(PRGDIR)/zstd
-test-lz4: ZSTD_LZ4 = LD_LIBRARY_PATH=/usr/local/lib ./lz4
-test-lz4: ZSTD_UNLZ4 = LD_LIBRARY_PATH=/usr/local/lib ./unlz4
+test-lz4: ZSTD = $(PRGDIR)/zstd
+test-lz4: ZSTD_LZ4 = ./lz4
+test-lz4: ZSTD_UNLZ4 = ./unlz4
 test-lz4: zstd decodecorpus datagen
        [ -f lz4 ] || ln -s $(PRGDIR)/zstd lz4
        [ -f unlz4 ] || ln -s $(PRGDIR)/zstd unlz4