tests: fix tar invocation, to address issue 6740 stable
authorArseniy Alekseyev <aalekseyev@janestreet.com>
Mon, 19 Sep 2022 17:34:42 -0400
branchstable
changeset 49486 58e38c1a2370
parent 49472 f64261762f3d
child 49490 37debd850c16
tests: fix tar invocation, to address issue 6740
tests/test-issue6528.t
tests/test-revlog.t
--- a/tests/test-issue6528.t	Thu Sep 01 16:41:48 2022 +0200
+++ b/tests/test-issue6528.t	Mon Sep 19 17:34:42 2022 -0400
@@ -177,7 +177,7 @@
   $ cd ..
   $ mkdir repo-to-fix
   $ cd repo-to-fix
-  $ tar -x < $TESTDIR/bundles/issue6528.tar
+  $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar
 
 Check that the issue is present
 (It is currently not present with rhg but will be when optimizations are added
@@ -278,7 +278,7 @@
   $ cd ..
   $ mkdir repo-to-fix-report
   $ cd repo-to-fix
-  $ tar -x < "$TESTDIR"/bundles/issue6528.tar
+  $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar
 
   $ hg debug-repair-issue6528 --to-report $TESTTMP/report.txt
   found affected revision 1 for filelog 'data/D.txt.i'
@@ -365,7 +365,7 @@
 
   $ mkdir repo-to-fix-not-inline
   $ cd repo-to-fix-not-inline
-  $ tar -x < "$TESTDIR"/bundles/issue6528.tar
+  $ tar -xf - < "$TESTDIR"/bundles/issue6528.tar
   $ echo b >> b.txt
   $ hg commit -qm "inline -> separate"
   $ find .hg -name *b.txt.d
--- a/tests/test-revlog.t	Thu Sep 01 16:41:48 2022 +0200
+++ b/tests/test-revlog.t	Mon Sep 19 17:34:42 2022 -0400
@@ -73,7 +73,7 @@
 - hg commit -Am_
 - remove some cache files
 
-  $ tar -x < "$TESTDIR"/bundles/test-revlog-diff-relative-to-nullrev.tar
+  $ tar -xf - < "$TESTDIR"/bundles/test-revlog-diff-relative-to-nullrev.tar
   $ cd nullrev-diff
   $ hg debugdeltachain a
       rev      p1      p2  chain# chainlen     prev   delta       size    rawsize  chainsize     ratio   lindist extradist extraratio   readsize largestblk rddensity srchunks