diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-04 21:07:08 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-04 21:57:51 -0500 |
| commit | 724b1b053796f953d22fd0c18d00f0b80e9e3fa0 (patch) | |
| tree | c1728205951d9f99fb4fcf061f01267a22032c74 | |
| parent | 3ea095937c479c15ad9a80c5986b0ed9bc07640b (diff) | |
tests/bcachefs: check counters in xfstests
| -rw-r--r-- | tests/bcachefs/bcachefs-test-libs.sh | 3 | ||||
| -rwxr-xr-x | tests/bcachefs/xfstests.ktest | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/tests/bcachefs/bcachefs-test-libs.sh b/tests/bcachefs/bcachefs-test-libs.sh index aa4718b..e74cd25 100644 --- a/tests/bcachefs/bcachefs-test-libs.sh +++ b/tests/bcachefs/bcachefs-test-libs.sh @@ -176,7 +176,7 @@ check_counters() local nr="${linea[1]}" if (( nr > max_fail )); then - echo "Too many $event: $nr" + echo "$dev: Too many $event: $nr ($line)" # Insert 0 byte seperators at the beginning of each trace event, # then grep in null separator mode to print full output of # multiline trace events: @@ -190,6 +190,7 @@ check_counters() echo "Transaction commits: $nr_commits" fi + bcachefs reset-counters $dev return $ret } diff --git a/tests/bcachefs/xfstests.ktest b/tests/bcachefs/xfstests.ktest index 3450da3..4164407 100755 --- a/tests/bcachefs/xfstests.ktest +++ b/tests/bcachefs/xfstests.ktest @@ -16,11 +16,16 @@ require-kernel-config QUOTA [[ ! -v MKFS_OPTIONS ]] && export MKFS_OPTIONS="--encrypted --no_passphrase" export FSTYP=bcachefs -run_tests() +run_test() { - setup_tracing 'bcachefs:*' - bcachefs_antagonist + if [[ ! -f /xfstests-init-done ]]; then + bcachefs_antagonist + fi + run_xfstests "$@" + + check_counters ${ktest_scratch_dev[0]} + check_counters ${ktest_scratch_dev[1]} } main "$@" |