cmd/tests: Fix the %~a check on Windows >= 8.

Francois Gouget fgouget at free.fr
Thu Nov 19 09:25:35 CST 2015


Starting with Windows 8 %~a reports two new attributes, most likely to match the new +X and +V attrib options (integrity and no_scrub_data respectively).

Signed-off-by: Francois Gouget <fgouget at free.fr>
---
 programs/cmd/tests/test_builtins.cmd.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

For now there's no reason for Wine to return the 11 attributes version 
rather than the 9 one so we may want an '@or@' instead of '@or_broken@'. 
But we don't have one and by the time we do we may want Wine to return 
the 11 attributes version and not the 9 one which would require using 
'@or_broken@' anyway.

diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index c2879d6..811ba9f 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -331,7 +331,7 @@ N
 @todo_wine@'@drive@@shortpath at ABCDEFGHIJK.LMNOP'@or_broken@''
 ''@or_broken@'%~ai'
 ''@or_broken@'%~ai'
-'--a------'@or_broken@'%~ai'
+'--a------'@or_broken@'--a--------'@or_broken@'%~ai'
 '5'@or_broken@'%~zi'
 ''@or_broken@'%~ti'
 ''@or_broken@'%~ti'
-- 
2.6.2



More information about the wine-patches mailing list