mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf lint: add make test-lint to perf tests

Browse Source 
Perf tests have not been linted for some time.
They've grown some seq instead of test_seq. This
runs the existing lints on the perf tests as well.

Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nipunn Koorapati
2020-10-20 13:41:02 +00:00
committed by Junio C Hamano
parent 89afd5f5ad
commit ed5a24573d
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/Makefile
View File

@ -34,6 +34,7 @@ CHAINLINTTMP_SQ = $(subst ','\'',$(CHAINLINTTMP))
T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)) T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh)) TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh))
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh))) THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
TPERF = $(sort $(wildcard perf/p[0-9][0-9][0-9][0-9]-*.sh))
CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test))) CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test)))
CHAINLINT = sed -f chainlint.sed CHAINLINT = sed -f chainlint.sed
@ -81,17 +82,17 @@ test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \
test-lint-filenames test-lint-filenames
test-lint-duplicates: test-lint-duplicates:
@dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \ @dups=`echo $(T) $(TPERF) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
test -z "$$dups" || { \ test -z "$$dups" || { \
echo >&2 "duplicate test numbers:" $$dups; exit 1; } echo >&2 "duplicate test numbers:" $$dups; exit 1; }
test-lint-executable: test-lint-executable:
@bad=`for i in $(T); do test -x "$$i" || echo $$i; done` && \ @bad=`for i in $(T) $(TPERF); do test -x "$$i" || echo $$i; done` && \
test -z "$$bad" || { \ test -z "$$bad" || { \
echo >&2 "non-executable tests:" $$bad; exit 1; } echo >&2 "non-executable tests:" $$bad; exit 1; }
test-lint-shell-syntax: test-lint-shell-syntax:
@'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS) @'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS) $(TPERF)
test-lint-filenames: test-lint-filenames:
@# We do *not* pass a glob to ls-files but use grep instead, to catch @# We do *not* pass a glob to ls-files but use grep instead, to catch

5
t/perf/Makefile
View File

@ -1,7 +1,7 @@
-include ../../config.mak -include ../../config.mak
export GIT_TEST_OPTIONS export GIT_TEST_OPTIONS
all: perf all: test-lint perf
perf: pre-clean perf: pre-clean
./run ./run
@ -12,4 +12,7 @@ pre-clean:
clean: clean:
rm -rf build "trash directory".* test-results rm -rf build "trash directory".* test-results
test-lint:
$(MAKE) -C .. test-lint
.PHONY: all perf pre-clean clean .PHONY: all perf pre-clean clean

6
t/perf/p3400-rebase.sh
View File

@ -9,16 +9,16 @@ test_expect_success 'setup rebasing on top of a lot of changes' '
git checkout -f -B base && git checkout -f -B base &&
git checkout -B to-rebase && git checkout -B to-rebase &&
git checkout -B upstream && git checkout -B upstream &&
for i in $(seq 100) for i in $(test_seq 100)
do do
# simulate huge diffs # simulate huge diffs
echo change$i >unrelated-file$i && echo change$i >unrelated-file$i &&
seq 1000 >>unrelated-file$i && test_seq 1000 >>unrelated-file$i &&
git add unrelated-file$i && git add unrelated-file$i &&
test_tick && test_tick &&
git commit -m commit$i unrelated-file$i && git commit -m commit$i unrelated-file$i &&
echo change$i >unrelated-file$i && echo change$i >unrelated-file$i &&
seq 1000 | tac >>unrelated-file$i && test_seq 1000 | tac >>unrelated-file$i &&
git add unrelated-file$i && git add unrelated-file$i &&
test_tick && test_tick &&
git commit -m commit$i-reverse unrelated-file$i || git commit -m commit$i-reverse unrelated-file$i ||