tests: make test-profile.t pass if statprof didn't collect samples

We had the first 3 tests in test-profile.t fail because the output
didn't match. I have not yet confirmed that this was because no
samples were collected, but we shouldn't require samples to be
collected for the test to pass either way.

Differential Revision: https://phab.mercurial-scm.org/D199
This commit is contained in:
Martin von Zweigbergk 2017-07-31 12:43:26 -07:00
parent 5e14d97b2b
commit 255c4290a2

View File

@ -4,21 +4,22 @@ test --time
$ hg init a
$ cd a
Function to check that statprof ran
$ statprofran () {
> egrep 'Sample count:|No samples recorded' > /dev/null
> }
test --profile
$ hg st --profile 2>&1 | grep Sample
Sample count: \d+ (re)
$ hg st --profile 2>&1 | statprofran
Abreviated version
$ hg st --prof 2>&1 | grep Sample
Sample count: \d+ (re)
$ hg st --prof 2>&1 | statprofran
In alias
$ hg --config "alias.profst=status --profile" profst 2>&1 | grep Sample
Sample count: \d+ (re)
$ hg --config "alias.profst=status --profile" profst 2>&1 | statprofran
#if lsprof
@ -81,26 +82,22 @@ Install an extension that can sleep and guarantee a profiler has time to run
statistical profiler works
$ hg --profile sleep 2>../out
$ grep Sample ../out
Sample count: \d+ (re)
$ cat ../out | statprofran
Various statprof formatters work
$ hg --profile --config profiling.statformat=byline sleep 2>../out
$ head -n 1 ../out
% cumulative self
$ grep Sample ../out
Sample count: \d+ (re)
$ cat ../out | statprofran
$ hg --profile --config profiling.statformat=bymethod sleep 2>../out
$ head -n 1 ../out
% cumulative self
$ grep Sample ../out
Sample count: \d+ (re)
$ cat ../out | statprofran
$ hg --profile --config profiling.statformat=hotpath sleep 2>../out
$ grep Sample ../out
Sample count: \d+ (re)
$ cat ../out | statprofran
$ hg --profile --config profiling.statformat=json sleep 2>../out
$ cat ../out