Mercurial > hg
diff tests/test-sparse-profiles.t @ 44724:5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
BSD-derived systems will use "ls -A" when running as root. Adjust the
test cases to always use the flag and include .hg and related output as
appropiately.
Differential Revision: https://phab.mercurial-scm.org/D8397
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Fri, 10 Apr 2020 19:58:34 +0200 |
parents | 9db856446298 |
children | dc5e5577af39 |
line wrap: on
line diff
--- a/tests/test-sparse-profiles.t Fri Apr 10 19:53:36 2020 +0200 +++ b/tests/test-sparse-profiles.t Fri Apr 10 19:58:34 2020 +0200 @@ -42,7 +42,8 @@ Verify enabling a single profile works $ hg debugsparse --enable-profile webpage.sparse - $ ls + $ ls -A + .hg backend.sparse index.html webpage.sparse @@ -50,7 +51,8 @@ Verify enabling two profiles works $ hg debugsparse --enable-profile backend.sparse - $ ls + $ ls -A + .hg backend.sparse data.py index.html @@ -59,7 +61,8 @@ Verify disabling a profile works $ hg debugsparse --disable-profile webpage.sparse - $ ls + $ ls -A + .hg backend.sparse data.py webpage.sparse @@ -81,20 +84,23 @@ $ echo foo >> data.py $ hg ci -m 'edit profile' - $ ls + $ ls -A + .hg backend.sparse data.py readme.txt webpage.sparse $ hg up -q 0 - $ ls + $ ls -A + .hg backend.sparse data.py webpage.sparse $ hg up -q 1 - $ ls + $ ls -A + .hg backend.sparse data.py readme.txt @@ -111,7 +117,8 @@ $ echo bar >> data.py $ hg ci -qAm "edit profile other" - $ ls + $ ls -A + .hg backend.sparse index.html webpage.sparse @@ -129,7 +136,8 @@ [1] $ rm *.orig - $ ls + $ ls -A + .hg backend.sparse data.py index.html @@ -154,7 +162,8 @@ (no more unresolved files) $ hg ci -qAm "merge profiles" - $ ls + $ ls -A + .hg backend.sparse index.html readme.txt @@ -168,7 +177,8 @@ Verify stripping refreshes dirstate $ hg strip -q -r . - $ ls + $ ls -A + .hg backend.sparse index.html webpage.sparse @@ -176,7 +186,8 @@ Verify rebase conflicts pulls in the conflicting changes $ hg up -q 1 - $ ls + $ ls -A + .hg backend.sparse data.py readme.txt @@ -192,7 +203,8 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ rm *.orig - $ ls + $ ls -A + .hg backend.sparse data.py index.html @@ -217,7 +229,8 @@ continue: hg rebase --continue $ hg rebase -q --continue - $ ls + $ ls -A + .hg backend.sparse index.html readme.txt @@ -237,13 +250,15 @@ $ hg commit -m "delete profiles" $ hg up -q ".^" $ hg debugsparse --enable-profile backend.sparse - $ ls + $ ls -A + .hg index.html readme.txt $ hg up tip | grep warning warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it [1] - $ ls + $ ls -A + .hg data.py index.html readme.txt