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)

diff --git a/test/recipes/25-test_configutl.t b/test/recipes/25-test_configutl.t
index a97a78eecd76fe1049aa429cd9e85b489138a550..880758b35a0c00c73c0944a761d045c83b445b9e 100644 (file)
--- a/test/recipes/25-test_configutl.t
+++ b/test/recipes/25-test_configutl.t
@@ -35,13 +35,13 @@ foreach my $file (@tests) {
        "-noheader", "-out", "$file.got"])));
 
     if ($file eq "includes.cnf") {
-        my $cmp1 = cmp_text("$file.got", srctop_file("test", "recipes", "25-test_configutl_data", "$file.expected1"));
-       my $cmp2 = cmp_text("$file.got", srctop_file("test", "recipes", "25-test_configutl_data", "$file.expected2"));
+        my $cmp1 = cmp_text("$file.got", srctop_file("test", "recipes", "25-test_configutl_data", "$file-exp1.out"));
+        my $cmp2 = cmp_text("$file.got", srctop_file("test", "recipes", "25-test_configutl_data", "$file-exp2.out"));
 
-       is((($cmp1 == 0) || ($cmp2 == 0)), 1, "$file got/expected 1/2");
+        is((($cmp1 == 0) || ($cmp2 == 0)), 1, "$file got/expected 1/2");
     } else {
         is(cmp_text("$file.got",
-           srctop_file("test", "recipes", "25-test_configutl_data", "$file.expected")),
+           srctop_file("test", "recipes", "25-test_configutl_data", "$file-exp.out")),
            0, "$file got/expected");
     }
 

diff --git a/test/recipes/25-test_configutl_data/escapes.cnf.expected b/test/recipes/25-test_configutl_data/escapes.cnf-exp.out
similarity index 100%
rename from test/recipes/25-test_configutl_data/escapes.cnf.expected
rename to test/recipes/25-test_configutl_data/escapes.cnf-exp.out

diff --git a/test/recipes/25-test_configutl_data/includes.cnf.expected1 b/test/recipes/25-test_configutl_data/includes.cnf-exp1.out
similarity index 100%
rename from test/recipes/25-test_configutl_data/includes.cnf.expected1
rename to test/recipes/25-test_configutl_data/includes.cnf-exp1.out

diff --git a/test/recipes/25-test_configutl_data/includes.cnf.expected2 b/test/recipes/25-test_configutl_data/includes.cnf-exp2.out
similarity index 100%
rename from test/recipes/25-test_configutl_data/includes.cnf.expected2
rename to test/recipes/25-test_configutl_data/includes.cnf-exp2.out

diff --git a/test/recipes/25-test_configutl_data/leading-and-trailing-whitespace.cnf.expected b/test/recipes/25-test_configutl_data/leading-and-trailing-whitespace.cnf-exp.out
similarity index 100%
rename from test/recipes/25-test_configutl_data/leading-and-trailing-whitespace.cnf.expected
rename to test/recipes/25-test_configutl_data/leading-and-trailing-whitespace.cnf-exp.out

diff --git a/test/recipes/25-test_configutl_data/order.cnf.expected b/test/recipes/25-test_configutl_data/order.cnf-exp.out
similarity index 100%
rename from test/recipes/25-test_configutl_data/order.cnf.expected
rename to test/recipes/25-test_configutl_data/order.cnf-exp.out

diff --git a/test/recipes/25-test_configutl_data/variables.cnf.expected b/test/recipes/25-test_configutl_data/variables.cnf-exp.out
similarity index 100%
rename from test/recipes/25-test_configutl_data/variables.cnf.expected
rename to test/recipes/25-test_configutl_data/variables.cnf-exp.out