2019-02-22 23:25:10 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='test trace2 facility (perf target)'
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2019-04-15 22:39:47 +02:00
|
|
|
# Turn off any inherited trace2 settings for this test.
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT
|
|
|
|
|
sane_unset GIT_TRACE2_PERF_BRIEF
|
|
|
|
|
sane_unset GIT_TRACE2_CONFIG_PARAMS
|
2019-04-15 22:39:47 +02:00
|
|
|
|
2019-02-22 23:25:10 +01:00
|
|
|
# Add t/helper directory to PATH so that we can use a relative
|
|
|
|
|
# path to run nested instances of test-tool.exe (see 004child).
|
|
|
|
|
# This helps with HEREDOC comparisons later.
|
|
|
|
|
TTDIR="$GIT_BUILD_DIR/t/helper/" && export TTDIR
|
|
|
|
|
PATH="$TTDIR:$PATH" && export PATH
|
|
|
|
|
|
|
|
|
|
# Warning: use of 'test_cmp' may run test-tool.exe and/or git.exe
|
|
|
|
|
# Warning: to do the actual diff/comparison, so the HEREDOCs here
|
|
|
|
|
# Warning: only cover our actual calls to test-tool and/or git.
|
|
|
|
|
# Warning: So you may see extra lines in artifact files when
|
|
|
|
|
# Warning: interactively debugging.
|
|
|
|
|
|
|
|
|
|
V=$(git version | sed -e 's/^git version //') && export V
|
|
|
|
|
|
|
|
|
|
# There are multiple trace2 targets: normal, perf, and event.
|
|
|
|
|
# Trace2 events will/can be written to each active target (subject
|
|
|
|
|
# to whatever filtering that target decides to do).
|
|
|
|
|
# Test each target independently.
|
|
|
|
|
#
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
# Defer setting GIT_TRACE2_PERF until the actual command we want to
|
2019-02-22 23:25:10 +01:00
|
|
|
# test because hidden git and test-tool commands in the test
|
|
|
|
|
# harness can contaminate our output.
|
|
|
|
|
|
|
|
|
|
# Enable "brief" feature which turns off the prefix:
|
|
|
|
|
# "<clock> <file>:<line> | <nr_parents> | "
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
GIT_TRACE2_PERF_BRIEF=1 && export GIT_TRACE2_PERF_BRIEF
|
2019-02-22 23:25:10 +01:00
|
|
|
|
|
|
|
|
# Repeat some of the t0210 tests using the perf target stream instead of
|
|
|
|
|
# the normal stream.
|
|
|
|
|
#
|
|
|
|
|
# Tokens here of the form _FIELD_ have been replaced in the observed output.
|
|
|
|
|
|
|
|
|
|
# Verb 001return
|
|
|
|
|
#
|
|
|
|
|
# Implicit return from cmd_<verb> function propagates <code>.
|
|
|
|
|
|
|
|
|
|
test_expect_success 'perf stream, return code 0' '
|
|
|
|
|
test_when_finished "rm trace.perf actual expect" &&
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 0 &&
|
2019-02-22 23:25:10 +01:00
|
|
|
perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
d0|main|version|||||$V
|
2019-04-15 22:39:44 +02:00
|
|
|
d0|main|start||_T_ABS_|||_EXE_ trace2 001return 0
|
2019-02-22 23:25:10 +01:00
|
|
|
d0|main|cmd_name|||||trace2 (trace2)
|
|
|
|
|
d0|main|exit||_T_ABS_|||code:0
|
|
|
|
|
d0|main|atexit||_T_ABS_|||code:0
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'perf stream, return code 1' '
|
|
|
|
|
test_when_finished "rm trace.perf actual expect" &&
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
test_must_fail env GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 001return 1 &&
|
2019-02-22 23:25:10 +01:00
|
|
|
perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
d0|main|version|||||$V
|
2019-04-15 22:39:44 +02:00
|
|
|
d0|main|start||_T_ABS_|||_EXE_ trace2 001return 1
|
2019-02-22 23:25:10 +01:00
|
|
|
d0|main|cmd_name|||||trace2 (trace2)
|
|
|
|
|
d0|main|exit||_T_ABS_|||code:1
|
|
|
|
|
d0|main|atexit||_T_ABS_|||code:1
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Verb 003error
|
|
|
|
|
#
|
|
|
|
|
# To the above, add multiple 'error <msg>' events
|
|
|
|
|
|
|
|
|
|
test_expect_success 'perf stream, error event' '
|
|
|
|
|
test_when_finished "rm trace.perf actual expect" &&
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 003error "hello world" "this is a test" &&
|
2019-02-22 23:25:10 +01:00
|
|
|
perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
d0|main|version|||||$V
|
2019-04-15 22:39:44 +02:00
|
|
|
d0|main|start||_T_ABS_|||_EXE_ trace2 003error '\''hello world'\'' '\''this is a test'\''
|
2019-02-22 23:25:10 +01:00
|
|
|
d0|main|cmd_name|||||trace2 (trace2)
|
|
|
|
|
d0|main|error|||||hello world
|
|
|
|
|
d0|main|error|||||this is a test
|
|
|
|
|
d0|main|exit||_T_ABS_|||code:0
|
|
|
|
|
d0|main|atexit||_T_ABS_|||code:0
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Verb 004child
|
|
|
|
|
#
|
|
|
|
|
# Test nested spawning of child processes.
|
|
|
|
|
#
|
|
|
|
|
# Conceptually, this looks like:
|
|
|
|
|
# P1: TT trace2 004child
|
|
|
|
|
# P2: |--- TT trace2 004child
|
|
|
|
|
# P3: |--- TT trace2 001return 0
|
|
|
|
|
#
|
|
|
|
|
# Which should generate events:
|
|
|
|
|
# P1: version
|
|
|
|
|
# P1: start
|
|
|
|
|
# P1: cmd_name
|
|
|
|
|
# P1: child_start
|
|
|
|
|
# P2: version
|
|
|
|
|
# P2: start
|
|
|
|
|
# P2: cmd_name
|
|
|
|
|
# P2: child_start
|
|
|
|
|
# P3: version
|
|
|
|
|
# P3: start
|
|
|
|
|
# P3: cmd_name
|
|
|
|
|
# P3: exit
|
|
|
|
|
# P3: atexit
|
|
|
|
|
# P2: child_exit
|
|
|
|
|
# P2: exit
|
|
|
|
|
# P2: atexit
|
|
|
|
|
# P1: child_exit
|
|
|
|
|
# P1: exit
|
|
|
|
|
# P1: atexit
|
|
|
|
|
|
|
|
|
|
test_expect_success 'perf stream, child processes' '
|
|
|
|
|
test_when_finished "rm trace.perf actual expect" &&
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
GIT_TRACE2_PERF="$(pwd)/trace.perf" test-tool trace2 004child test-tool trace2 004child test-tool trace2 001return 0 &&
|
2019-02-22 23:25:10 +01:00
|
|
|
perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
d0|main|version|||||$V
|
2019-04-15 22:39:44 +02:00
|
|
|
d0|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 004child test-tool trace2 001return 0
|
2019-02-22 23:25:10 +01:00
|
|
|
d0|main|cmd_name|||||trace2 (trace2)
|
2019-08-09 17:00:57 +02:00
|
|
|
d0|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 004child test-tool trace2 001return 0]
|
2019-02-22 23:25:10 +01:00
|
|
|
d1|main|version|||||$V
|
2019-04-15 22:39:44 +02:00
|
|
|
d1|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 001return 0
|
2019-02-22 23:25:10 +01:00
|
|
|
d1|main|cmd_name|||||trace2 (trace2/trace2)
|
2019-08-09 17:00:57 +02:00
|
|
|
d1|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 001return 0]
|
2019-02-22 23:25:10 +01:00
|
|
|
d2|main|version|||||$V
|
2019-04-15 22:39:44 +02:00
|
|
|
d2|main|start||_T_ABS_|||_EXE_ trace2 001return 0
|
2019-02-22 23:25:10 +01:00
|
|
|
d2|main|cmd_name|||||trace2 (trace2/trace2/trace2)
|
|
|
|
|
d2|main|exit||_T_ABS_|||code:0
|
|
|
|
|
d2|main|atexit||_T_ABS_|||code:0
|
|
|
|
|
d1|main|child_exit||_T_ABS_|_T_REL_||[ch0] pid:_PID_ code:0
|
|
|
|
|
d1|main|exit||_T_ABS_|||code:0
|
|
|
|
|
d1|main|atexit||_T_ABS_|||code:0
|
|
|
|
|
d0|main|child_exit||_T_ABS_|_T_REL_||[ch0] pid:_PID_ code:0
|
|
|
|
|
d0|main|exit||_T_ABS_|||code:0
|
|
|
|
|
d0|main|atexit||_T_ABS_|||code:0
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
trace2: rename environment variables to GIT_TRACE2*
For an environment variable that is supposed to be set by users, the
GIT_TR2* env vars are just too unclear, inconsistent, and ugly.
Most of the established GIT_* environment variables don't use
abbreviations, and in case of the few that do (GIT_DIR,
GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the
abbreviations (DIR and OPTS) stand for. But what does TR stand for?
Track, traditional, trailer, transaction, transfer, transformation,
transition, translation, transplant, transport, traversal, tree,
trigger, truncate, trust, or ...?!
The trace2 facility, as the '2' suffix in its name suggests, is
supposed to eventually supercede Git's original trace facility. It's
reasonable to expect that the corresponding environment variables
follow suit, and after the original GIT_TRACE variables they are
called GIT_TRACE2; there is no such thing is 'GIT_TR'.
All trace2-specific config variables are, very sensibly, in the
'trace2' section, not in 'tr2'.
OTOH, we don't gain anything at all by omitting the last three
characters of "trace" from the names of these environment variables.
So let's rename all GIT_TR2* environment variables to GIT_TRACE2*,
before they make their way into a stable release.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-19 16:43:08 +02:00
|
|
|
sane_unset GIT_TRACE2_PERF_BRIEF
|
2019-04-15 22:39:47 +02:00
|
|
|
|
|
|
|
|
# Now test without environment variables and get all Trace2 settings
|
|
|
|
|
# from the global config.
|
|
|
|
|
|
|
|
|
|
test_expect_success 'using global config, perf stream, return code 0' '
|
|
|
|
|
test_when_finished "rm trace.perf actual expect" &&
|
|
|
|
|
test_config_global trace2.perfBrief 1 &&
|
|
|
|
|
test_config_global trace2.perfTarget "$(pwd)/trace.perf" &&
|
|
|
|
|
test-tool trace2 001return 0 &&
|
|
|
|
|
perl "$TEST_DIRECTORY/t0211/scrub_perf.perl" <trace.perf >actual &&
|
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
d0|main|version|||||$V
|
|
|
|
|
d0|main|start||_T_ABS_|||_EXE_ trace2 001return 0
|
|
|
|
|
d0|main|cmd_name|||||trace2 (trace2)
|
|
|
|
|
d0|main|exit||_T_ABS_|||code:0
|
|
|
|
|
d0|main|atexit||_T_ABS_|||code:0
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2019-02-22 23:25:10 +01:00
|
|
|
test_done
|