On Fri, Dec 17, 2021 at 05:24:59AM +0100, Ævar Arnfjörð Bjarmason wrote: > Test what happens when we "stop" without a "start", omit the "stop" > after a "start", or try to start two concurrent progress bars. I think the concurrent case is missing (I guess that's not blocking) > This extends the trace2 tests added in 98a13647408 (trace2: log progress > time and throughput, 2020-05-12). > > These tests are not merely testing the helper, but invalid API usage > that can happen if the progress.c API is misused. > > The "without stop" test will leak under SANITIZE=leak, since this > buggy use of the API will leak memory. But let's not skip it entirely, > or use the "!SANITIZE_LEAK" prerequisite check as we'd do with tests > that we're skipping due to leaks we haven't fixed yet. Instead > annotate the specific command that should skip leak checking with > custom $LSAN_OPTIONS[1]. > > 1. https://github.com/google/sanitizers/wiki/AddressSanitizerLeakSanitizer > > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> > --- > t/t0500-progress-display.sh | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh > index 27ab4218b01..59e9f226ea4 100755 > --- a/t/t0500-progress-display.sh > +++ b/t/t0500-progress-display.sh > @@ -325,4 +325,39 @@ test_expect_success 'progress generates traces' ' > grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event > ' > > +test_expect_success 'progress generates traces: stop / start' ' > + cat >in <<-\EOF && > + start 0 > + stop > + EOF > + > + GIT_TRACE2_EVENT="$(pwd)/trace-startstop.event" test-tool progress \ > + <in 2>stderr && > + test_region progress "Working hard" trace-startstop.event > +' > + > +test_expect_success 'progress generates traces: start without stop' ' > + cat >in <<-\EOF && > + start 0 > + EOF > + > + GIT_TRACE2_EVENT="$(pwd)/trace-start.event" \ > + LSAN_OPTIONS=detect_leaks=0 \ > + test-tool progress \ > + <in 2>stderr && nit: I personally prefer always indenting after continuation lines, like GIT_TRACE2_EVENT="$(pwd)/trace-start.event" \ LSAN_OPTIONS=detect_leaks=0 \ test-tool progress \ <in 2>stderr && but we don't have a uniform style, so it doesn't really matter. > + grep region_enter.*progress trace-start.event && > + ! grep region_leave.*progress trace-start.event should "!" be "test_must_fail"? Same below. > +' > + > +test_expect_success 'progress generates traces: stop without start' ' > + cat >in <<-\EOF && > + stop > + EOF > + > + GIT_TRACE2_EVENT="$(pwd)/trace-stop.event" test-tool progress \ > + <in 2>stderr && > + ! grep region_enter.*progress trace-stop.event && > + ! grep region_leave.*progress trace-stop.event > +' > + > test_done > -- > 2.34.1.1119.g7a3fc8778ee >
