Skip to content

Commit

Permalink
configure-sampledata: only create random paths if asked
Browse files Browse the repository at this point in the history
Stop creating randomized paths in t/sampledata/ by default.  I'd
originally just added this to allow some quick testing, and while it
now appears to be fine on Linux/ext4, it's too aggressive to be the
default, so hide it behind a BUP_TEST_RANDOMIZED_SAMPLEDATA_PATHS
environment variable.

Among other things, make-random-paths just crashes on cirrus macos,
and cirrus freebsd was having (different) trouble.  It might also have
been macos where test-import-duplicity.sh failed on compare-trees
mismatches.  Not sure whether that was an issue with bup, rsync, or
duplicity.

We'll want to restore broader randomized path testing, but likely via
a less blunt instrument, since placing the paths in t/sampledata
affects any test that relies on it, and existing testing constructs
like

  WVPASSEQ ... $(... | wc -l)

are completely incompatible.

Signed-off-by: Rob Browning <[email protected]>
  • Loading branch information
rlbdv committed Jul 5, 2020
1 parent 848ebbe commit eabe403
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion t/configure-sampledata
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ case "$1" in
cp -pP "$top"/Documentation/*.md doc/ || exit $?
cp -pP "$top"/lib/bup/*.py lib/bup || exit $?
mkdir path-zoo || exit $?
"$top"/t/make-random-paths 3000 path-zoo || exit $?
if test "$BUP_TEST_RANDOMIZED_SAMPLEDATA_PATHS"; then
"$top"/t/make-random-paths 3000 path-zoo || exit $?
fi
# The "v" ensures that if "configure-sampledata
# --revision" and/or the setup above fails somehow,
# callers like make will be looking for a file that won't
Expand Down

0 comments on commit eabe403

Please sign in to comment.