]> git.ipfire.org Git - thirdparty/openssl.git/commit
tests: fix configutl test on Windows 29409/head
authorMilan Broz <gmazyland@gmail.com>
Mon, 9 Mar 2026 13:02:03 +0000 (14:02 +0100)
committerTomas Mraz <tomas@openssl.org>
Tue, 10 Mar 2026 19:42:20 +0000 (20:42 +0100)
commit2cf43bb1e49f07ad74b3413fe8c9577252ede28c
treef8da51f35f489430a87ca493cdae08a901784b72
parent99ba983e28f07c6dc38538cd9bc71cd3e070f3c4
tests: fix configutl test on Windows

In Windows makefile, "del /Q /S /F test\*.exp" command is called.
Due to use of /S switch and old filenames compatibility
magic, it deletes also all *.expected files.
This make subsequent run of configtest to fail.

As this is the only test using these names (and cryptic
workarounds in makefile are unreadable), let's just
rename expected files to *-exp.out suffix.

Also fix two alien tabs in script.

Fixes: https://github.com/openssl/project/issues/1894
Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Tue Mar 10 19:42:26 2026
(Merged from https://github.com/openssl/openssl/pull/30324)
test/recipes/25-test_configutl.t
test/recipes/25-test_configutl_data/escapes.cnf-exp.out [moved from test/recipes/25-test_configutl_data/escapes.cnf.expected with 100% similarity]
test/recipes/25-test_configutl_data/includes.cnf-exp1.out [moved from test/recipes/25-test_configutl_data/includes.cnf.expected1 with 100% similarity]
test/recipes/25-test_configutl_data/includes.cnf-exp2.out [moved from test/recipes/25-test_configutl_data/includes.cnf.expected2 with 100% similarity]
test/recipes/25-test_configutl_data/leading-and-trailing-whitespace.cnf-exp.out [moved from test/recipes/25-test_configutl_data/leading-and-trailing-whitespace.cnf.expected with 100% similarity]
test/recipes/25-test_configutl_data/order.cnf-exp.out [moved from test/recipes/25-test_configutl_data/order.cnf.expected with 100% similarity]
test/recipes/25-test_configutl_data/variables.cnf-exp.out [moved from test/recipes/25-test_configutl_data/variables.cnf.expected with 100% similarity]