The 20th batch

[thirdparty/git.git] / t / t7704-repack-cruft.sh

diff --git a/t/t7704-repack-cruft.sh b/t/t7704-repack-cruft.sh
index be3735dff0837a6050780082f3acc4e1f7da37dc..5db9f4e10f75e92094c9a58a61728dc868e80479 100755 (executable)
--- a/t/t7704-repack-cruft.sh
+++ b/t/t7704-repack-cruft.sh
@@ -2,6 +2,7 @@
 
 test_description='git repack works correctly'
 
 
 test_description='git repack works correctly'
 

+TEST_PASSES_SANITIZE_LEAK=true

 . ./test-lib.sh
 
 objdir=.git/objects
 . ./test-lib.sh
 
 objdir=.git/objects


@@ -48,7 +49,7 @@ test_expect_success '--expire-to stores pruned objects (now)' '
                # ...in other words, the combined contents of this
                # repository and expired.git should be the same as the
                # set of objects we started with.
                # ...in other words, the combined contents of this
                # repository and expired.git should be the same as the
                # set of objects we started with.

-               cat expired.objects remaining.objects | sort >actual &&
+               sort expired.objects remaining.objects >actual &&

                test_cmp expect actual &&
 
                # The "moved" objects (i.e., those in expired.git)
                test_cmp expect actual &&
 
                # The "moved" objects (i.e., those in expired.git)


@@ -330,7 +331,7 @@ test_expect_success '--max-cruft-size with pruning' '
                # repack (and prune) with a --max-cruft-size to ensure
                # that we appropriately split the resulting set of packs
                git repack -d --cruft --max-cruft-size=1M \
                # repack (and prune) with a --max-cruft-size to ensure
                # that we appropriately split the resulting set of packs
                git repack -d --cruft --max-cruft-size=1M \

-                       --cruft-expiration=10.seconds.ago &&
+                       --cruft-expiration=1000.seconds.ago &&

                ls $packdir/pack-*.mtimes | sort >cruft.after &&
 
                for cruft in $(cat cruft.after)
                ls $packdir/pack-*.mtimes | sort >cruft.after &&
 
                for cruft in $(cat cruft.after)