Skip to contentSkip to conversation

fstests: fix _filter_transcation_commit_default

PATCH In review Eric Sandeen 2 participants 2 messages Mar 24, 2015 – Mar 25, 2015 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fstests: fix _filter_transcation_commit_default

btrfs has started emitting new information from cmd_subvol_delete(), so filter that out or it breaks btrfs/001:

-Delete subvolume 'SCRATCH_MNT/snap' +Delete subvolume (no-commit): 'SCRATCH_MNT/snap'

(Spell "transaction" correctly while we're at it.)

---

common/filter.btrfs +4 -3
index ea047c5..9bb6479 100644
@@ -57,13 +57,14 @@ _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
-_filter_transcation_commit_default() {
-	sed -e "/Transaction commit: none (default)/d"
+_filter_transaction_commit() {
+	sed -e "/Transaction commit: none (default)/d" | \
+	sed -e "s/Delete subvolume (.*commit):/Delete subvolume/g"
 }
 
 _filter_btrfs_subvol_delete()
 {
-	_filter_scratch | _filter_transcation_commit_default
+	_filter_scratch | _filter_transaction_commit
 
 }
 
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Eric Sandeen

btrfs has started emitting new information from cmd_subvol_delete(), so filter that out or it breaks btrfs/001:

-Delete subvolume 'SCRATCH_MNT/snap' +Delete subvolume (no-commit): 'SCRATCH_MNT/snap'

(Spell "transaction" correctly while we're at it.)

Looks good to me.

Quoted 29 lines

---

common/filter.btrfs +4 -4
index ea047c5..9bb6479 100644
@@ -57,13 +57,14 @@ _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
-_filter_transcation_commit_default() {
-	sed -e "/Transaction commit: none (default)/d"
+_filter_transaction_commit() {
+	sed -e "/Transaction commit: none (default)/d" | \
+	sed -e "s/Delete subvolume (.*commit):/Delete subvolume/g"
 }
 
 _filter_btrfs_subvol_delete()
 {
-	_filter_scratch | _filter_transcation_commit_default
+	_filter_scratch | _filter_transaction_commit
 
 }
 
 
--

To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html