# HG changeset patch # User Matt Harbison # Date 2021-04-04 00:25:37 # Node ID 915a60bf3cb627a59be97084c7161700d8f5b4f9 # Parent 7ce8b4d2bd55f100de4faec766bcf177832079b6 tests: handle Windows file separator differences in test-config.t Differential Revision: https://phab.mercurial-scm.org/D10299 diff --git a/tests/test-config.t b/tests/test-config.t --- a/tests/test-config.t +++ b/tests/test-config.t @@ -1,3 +1,17 @@ +Windows needs ';' as a file separator in an environment variable, and MSYS +doesn't automatically convert it in every case. + +#if windows + $ path_list_var() { + > echo $1 | sed 's/:/;/' + > } +#else + $ path_list_var() { + > echo $1 + > } +#endif + + hide outer repo $ hg init @@ -446,7 +460,7 @@ Simple order checking If file B is read after file A, value from B overwrite value from A. - $ HGRCPATH="file-A.rc:file-B.rc" hg config config-test.basic + $ HGRCPATH=`path_list_var "file-A.rc:file-B.rc"` hg config config-test.basic value-B Ordering from include @@ -462,7 +476,7 @@ value from an include overwrite value de command line override --------------------- - $ HGRCPATH="file-A.rc:file-B.rc" hg config config-test.basic --config config-test.basic=value-CLI + $ HGRCPATH=`path_list_var "file-A.rc:file-B.rc"` hg config config-test.basic --config config-test.basic=value-CLI value-CLI Alias ordering @@ -480,7 +494,7 @@ considered "higher level". And higher le value-A $ HGRCPATH="file-B.rc" hg log -r . value-B - $ HGRCPATH="file-A.rc:file-B.rc" hg log -r . + $ HGRCPATH=`path_list_var "file-A.rc:file-B.rc"` hg log -r . value-B Alias and include @@ -497,5 +511,5 @@ See the case above for details about the command line override --------------------- - $ HGRCPATH="file-A.rc:file-B.rc" hg log -r . --config ui.logtemplate="value-CLI\n" + $ HGRCPATH=`path_list_var "file-A.rc:file-B.rc"` hg log -r . --config ui.logtemplate="value-CLI\n" value-CLI