# HG changeset patch # User Martin von Zweigbergk # Date 1501530206 25200 # Node ID a72b2db1a6a9f82b5576dfcbac059f10836e6b79 # Parent d524cd1d1648408d1bab9eee9464ad2513a648be 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 diff -r d524cd1d1648 -r a72b2db1a6a9 tests/test-profile.t --- a/tests/test-profile.t Thu Jul 27 10:52:56 2017 +0200 +++ b/tests/test-profile.t Mon Jul 31 12:43:26 2017 -0700 @@ -4,21 +4,22 @@ $ 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 @@ 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