Page MenuHomeFreeBSD
Files F177518217

D61459.1794609942.diff
No OneTemporary
Actions

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61459.1794609942.diff
View Options

diff --git a/tests/sys/pmc/amd/pmc_frontend_test.sh b/tests/sys/pmc/amd/pmc_frontend_test.sh
--- a/tests/sys/pmc/amd/pmc_frontend_test.sh
+++ b/tests/sys/pmc/amd/pmc_frontend_test.sh
@@ -36,8 +36,10 @@
rc=$?
kill "$load" 2>/dev/null
wait
- [ "$rc" -eq 0 ] || \
- atf_fail "pmc record -s frontend failed: $(cat record.out)"
+ if [ "$rc" -ne 0 ]; then
+ cat record.out >&2
+ atf_fail "pmc record -s frontend failed"
+ fi
# Each decoded sample row of the analysis carries miss percentages.
atf_check -s exit:0 -o save:frontend.txt -e ignore \
diff --git a/tests/sys/pmc/pmc_cli_test.sh b/tests/sys/pmc/pmc_cli_test.sh
--- a/tests/sys/pmc/pmc_cli_test.sh
+++ b/tests/sys/pmc/pmc_cli_test.sh
@@ -76,7 +76,8 @@
if ! pmc_record -c instructions -t 2 record.pmc; then
grep -q "Cannot allocate event" record.out && \
atf_skip "no instructions event on this CPU"
- atf_fail "pmc record failed: $(cat record.out)"
+ cat record.out >&2
+ atf_fail "pmc record failed"
fi
atf_check -s exit:0 -o save:info.txt -e ignore pmc info record.pmc
@@ -84,8 +85,10 @@
# listed under the name libpmc resolved it to.
awk '/^Counter/ { t = 1; next }
t && $NF ~ /^[0-9]+$/ && $NF > 0 { found = 1 }
- END { exit(found ? 0 : 1) }' info.txt || \
- atf_fail "pmc info shows no samples: $(tail -5 info.txt)"
+ END { exit(found ? 0 : 1) }' info.txt || {
+ cat info.txt >&2
+ atf_fail "pmc info shows no samples"
+ }
}
atf_init_test_cases()
diff --git a/tests/sys/pmc/pmcstat_tsc_test.sh b/tests/sys/pmc/pmcstat_tsc_test.sh
--- a/tests/sys/pmc/pmcstat_tsc_test.sh
+++ b/tests/sys/pmc/pmcstat_tsc_test.sh
@@ -21,7 +21,8 @@
2> pmcstat.err; then
grep -q "Cannot allocate system-mode pmc" pmcstat.err && \
atf_skip "cannot allocate a system-mode instructions PMC"
- atf_fail "pmcstat failed: $(cat pmcstat.err)"
+ cat pmcstat.err >&2
+ atf_fail "pmcstat failed"
fi
[ -s "$1" ] || atf_fail "pmcstat produced an empty log"
}

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 13, 10:45 PM (3 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41710236
Default Alt Text
D61459.1794609942.diff (1 KB)

Event Timeline