Skip to content

Commit

Permalink
Merge pull request #4247 from facebook/test_endMsg
Browse files Browse the repository at this point in the history
Added a human-readable final success message at end of tests
  • Loading branch information
Cyan4973 authored Jan 18, 2025
2 parents c8243b4 + 4f3311f commit 053e4be
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
task:
name: FreeBSD (shortest)
name: FreeBSD (make check)
freebsd_instance:
matrix:
image_family: freebsd-14-1
install_script: pkg install -y gmake coreutils
script: |
MOREFLAGS="-Werror" gmake -j all
gmake shortest
gmake check
2 changes: 1 addition & 1 deletion .github/workflows/commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
make c99build; make clean
make c11build; make clean
make -j regressiontest; make clean
make shortest; make clean
make check; make clean
make cxxtest; make clean
short-tests-1:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dev-short-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@ jobs:
- name: install valgrind
run: |
sudo apt-get -qqq update
make valgrindinstall
make valgrindinstall V=1
- name: zlib wrapper test
run: make -C zlibWrapper test
run: make -C zlibWrapper test V=1
- name: zlib wrapper test under valgrind
run: make -C zlibWrapper test-valgrind
run: make -C zlibWrapper test-valgrind V=1

lz4-threadpool-libs:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Our contribution process works in three main stages:
* Note: run local tests to ensure that your changes didn't break existing functionality
* Quick check
```
make shortest
make check
```
* Longer check
```
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,10 @@ test:
$(MAKE) -C $(TESTDIR) $@
ZSTD=../../programs/zstd $(MAKE) -C doc/educational_decoder $@

## shortest: same as `make check`
.PHONY: shortest
shortest:
$(Q)$(MAKE) -C $(TESTDIR) $@

## check: run basic tests for `zstd` cli
.PHONY: check
check: shortest
check:
$(Q)$(MAKE) -C $(TESTDIR) $@

.PHONY: automated_benchmarking
automated_benchmarking:
Expand Down
13 changes: 8 additions & 5 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,12 @@ endif
list:
@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | xargs

.PHONY: shortest
shortest: ZSTDRTTEST= # remove long tests
shortest: test-zstd

.PHONY: check
check: shortest
check: ZSTDRTTEST= # remove long tests
check: test-zstd
@echo "\n******************************"
@echo "All tests completed successfully"
@echo "******************************"

.PHONY: fuzztest
fuzztest: test-fuzzer test-zstream test-decodecorpus
Expand All @@ -327,6 +327,9 @@ test: test-zstd test-cli-tests test-fullbench test-fuzzer test-zstream test-inva
ifeq ($(QEMU_SYS),)
test: test-pool
endif
@echo "\n******************************"
@echo "All tests completed successfully"
@echo "******************************"

.PHONY: test32
test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zstream32
Expand Down
3 changes: 2 additions & 1 deletion tests/playTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,6 @@ then
roundTripTest -g4M "1 -T0 --auto-threads=physical"
roundTripTest -g4M "1 -T0 --auto-threads=logical"
roundTripTest -g8M "3 -T2"
roundTripTest -g8M "19 --long"
roundTripTest -g8000K "2 --threads=2"
fileRoundTripTest -g4M "19 -T2 -B1M"

Expand Down Expand Up @@ -1850,6 +1849,8 @@ roundTripTest -g18000017 -P88 17
roundTripTest -g18000018 -P94 18
roundTripTest -g18000019 -P96 19

roundTripTest -g8M "19 --long"

roundTripTest -g5000000000 -P99 "1 --zstd=wlog=25"
roundTripTest -g3700000000 -P0 "1 --zstd=strategy=6,wlog=25" # ensure btlazy2 can survive an overflow rescale

Expand Down

0 comments on commit 053e4be

Please sign in to comment.