Skip to content

Commit f9938c2

Browse files
vasiCyan4973
authored andcommitted
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!
1 parent 448a09f commit f9938c2

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

.github/workflows/dev-short-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ jobs:
170170
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
171171
- name: LZ4, thread pool, and libs build testslib wrapper test
172172
run: |
173-
make lz4install
174173
make -C tests test-lz4
175174
make check < /dev/null | tee # mess with lz4 console detection
176175
make clean

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ apt-add-repo:
351351
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
352352
sudo apt-get update -y -qq
353353

354-
.PHONY: ppcinstall arminstall valgrindinstall libc6install gcc6install gcc7install gcc8install gpp6install clang38install lz4install
354+
.PHONY: ppcinstall arminstall valgrindinstall libc6install gcc6install gcc7install gcc8install gpp6install clang38install
355355
ppcinstall:
356356
APT_PACKAGES="qemu-system-ppc qemu-user-static gcc-powerpc-linux-gnu" $(MAKE) apt-install
357357

@@ -379,10 +379,6 @@ gpp6install: apt-add-repo
379379
clang38install:
380380
APT_PACKAGES="clang-3.8" $(MAKE) apt-install
381381

382-
# Ubuntu 14.04 ships a too-old lz4
383-
lz4install:
384-
[ -e lz4 ] || git clone https://github.com/lz4/lz4 && sudo $(MAKE) -C lz4 install
385-
386382
endif
387383

388384

tests/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,9 @@ test-decodecorpus-cli: decodecorpus
447447
test-pool: poolTests
448448
$(QEMU_SYS) ./poolTests
449449

450-
test-lz4: ZSTD = LD_LIBRARY_PATH=/usr/local/lib $(PRGDIR)/zstd
451-
test-lz4: ZSTD_LZ4 = LD_LIBRARY_PATH=/usr/local/lib ./lz4
452-
test-lz4: ZSTD_UNLZ4 = LD_LIBRARY_PATH=/usr/local/lib ./unlz4
450+
test-lz4: ZSTD = $(PRGDIR)/zstd
451+
test-lz4: ZSTD_LZ4 = ./lz4
452+
test-lz4: ZSTD_UNLZ4 = ./unlz4
453453
test-lz4: zstd decodecorpus datagen
454454
[ -f lz4 ] || ln -s $(PRGDIR)/zstd lz4
455455
[ -f unlz4 ] || ln -s $(PRGDIR)/zstd unlz4

0 commit comments

Comments
 (0)