[PATCH] tests: more completely restore the environment in syshgenv

[Matt Harbison]

On Thu, 29 Jun 2017 15:21:10 -0400, Adam Simpkins <simpkins at fb.com> wrote:

> On Jun 29, Matt Harbison wrote:
>> On Wed, 28 Jun 2017 15:34:56 -0400, Adam Simpkins <simpkins at fb.com>  
>> wrote:
>>
>> ># HG changeset patch
>> ># User Adam Simpkins <simpkins at fb.com>
>> ># Date 1498677802 25200
>> >#      Wed Jun 28 12:23:22 2017 -0700
>> ># Node ID 236c593941ab8034c500039c54bee0b3a19a0cef
>> ># Parent  649cb52c8cd94ab98068004e40bf9947de62a0ce
>> >tests: more completely restore the environment in syshgenv
>> >
>> ...
>>
>> >diff --git a/tests/run-tests.py b/tests/run-tests.py
>> >--- a/tests/run-tests.py
>> >+++ b/tests/run-tests.py
>> ...

>> --- c:/Users/Matt/projects/hg/tests/test-check-code.t
>> +++ c:/Users/Matt/projects/hg/tests/test-check-code.t.err
>> @@ -9,6 +9,8 @@
>>
>>    $ syshg locate -X contrib/python-zstandard -X
>> hgext/fsmonitor/pywatchman |
>>    > sed 's-\\-/-g' | "$check_code" --warnings --per-file=0 - || false
>> +
>> C:\Users\Matt\AppData\Local\Temp\hgtests.jjx4mu\child1\restoreenv.sh:
>> line 17: syntax error near unexpected token `X86'
>> +
>> C:\Users\Matt\AppData\Local\Temp\hgtests.jjx4mu\child1\restoreenv.sh:
>> line 17: `PROGRAMFILES(X86)='C:\Program Files (x86)''
>>    Skipping i18n/polib.py it has no-che?k-code (glob)
>>    Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
>>    Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
>
> That's actually a little interesting, since Windows appears to have an
> environment variable with a '(' character in it.  I believe sh doesn't
> allow setting variables with '(' characters.  For now I think we'll
> just have to live with not restoring these variables.

That seems OK, but we probably need to support it on the value side for  
things like $PATH.

Here's the Windows test system for reference, complete with variables,  
including a multiline(!) one.

https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/27/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio

(To the other thread, IDR if I enabled evolve on it.)


>> Additionally, I wonder if the '\' in the paths need to be escaped.
>> Looking at restoreenv.sh has lines like this:
>>
>> PSMODULEPATH='C:\Windows\system32\WindowsPowerShell\v1.0\Modules\'
>> VS90COMNTOOLS='c:\Program Files (x86)\Microsoft Visual Studio
>> 9.0\Common7\Tools\'
>> COMMONPROGRAMFILES='C:\Program Files\Common Files'
>>
>> My editor wants to color 'VS90COMNTOOLS=' as part of the string on
>> the previous line.
>
> That seems like an issue with your editor's coloring to me.
> Backslashes inside single-quoted strings are not special characters,
> and are treated literally:
> http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_02_02

OK, thanks for the reference.  It's notepad++