From: David Bremner <david@tethera.net>
Date: Sat, 8 May 2021 13:57:35 +0000 (-0300)
Subject: perf-test/T00-new: fix backup creation.
X-Git-Tag: archive/debian/0.33_rc0-1~84
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=564a83077a1bede8b4c8cb39909a135dfe3feb59

perf-test/T00-new: fix backup creation.

"xargs tar cf backup.tar < $manifest" recreates the tar file with each
"batch" execed by xargs. In general this results in only a fraction of
the desired files being backed up.
---

diff --git a/performance-test/T00-new.sh b/performance-test/T00-new.sh
index 53de1c27..de260b2d 100755
--- a/performance-test/T00-new.sh
+++ b/performance-test/T00-new.sh
@@ -5,16 +5,16 @@ test_description='notmuch new'
 . $(dirname "$0")/perf-test-lib.sh || exit 1
 
 uncache_database
-
 time_start
 
+manifest=$(mktemp manifestXXXXXX)
+find mail -type f ! -path 'mail/.notmuch/*' | sed -n '1~4 p' > $manifest
+xargs tar uf backup.tar < $manifest
+
 for i in $(seq 2 6); do
     time_run "notmuch new #$i" 'notmuch new'
 done
 
-manifest=$(mktemp manifestXXXXXX)
-
-find mail -type f ! -path 'mail/.notmuch/*' | sed -n '1~4 p' > $manifest
 # arithmetic context is to eat extra whitespace on e.g. some BSDs
 count=$((`wc -l < $manifest`))
 
@@ -26,8 +26,6 @@ perl -nle 'rename "$_.renamed", $_' $manifest
 
 time_run "new ($count mv back)" 'notmuch new'
 
-xargs tar cf backup.tar < $manifest
-
 perl -nle 'unlink $_; unlink $_.copy' $manifest
 
 time_run "new ($count rm)" 'notmuch new'