cxx-qt-gen: fix test on windows (remove '\r')

On windows sometime the generated file, or the value returned from the
clang-format call get \r in them.

It is sane to remove all of them, to get consistency between unix and
windows system for tests.

Author: OlivierLDff

.github/workflows/github-cxx-qt-tests.yml

@@ -91,7 +91,7 @@ jobs:
             # FIXME: many tests fail to link
             # https://github.com/KDAB/cxx-qt/issues/111
             # cxx_qt_lib_cargo_tests fails to run with a missing DLL error.
-            ctest_args: --exclude-regex '^(cxx_qt_gen_cargo_tests|demo_threading_cargo_tests|example_qml.*|qml.*tests|test.*|reuse_lint|cpp_clang_format|.*valgrind|cxx_qt_lib_cargo_tests)$'
+            ctest_args: --exclude-regex '^(demo_threading_cargo_tests|example_qml.*|qml.*tests|test.*|reuse_lint|cpp_clang_format|.*valgrind|cxx_qt_lib_cargo_tests)$'
             exe_suffix: .exe
             qt_qpa_platform: windows
             compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
@@ -106,7 +106,7 @@ jobs:
             # FIXME: many tests fail to link
             # https://github.com/KDAB/cxx-qt/issues/111
             # cxx_qt_lib_cargo_tests fails to run with a missing DLL error.
-            ctest_args: --exclude-regex '^(cxx_qt_gen_cargo_tests|demo_threading_cargo_tests|example_qml.*|qml.*tests|test.*|reuse_lint|cpp_clang_format|.*valgrind|cxx_qt_lib_cargo_tests)$'
+            ctest_args: --exclude-regex '^(demo_threading_cargo_tests|example_qml.*|qml.*tests|test.*|reuse_lint|cpp_clang_format|.*valgrind|cxx_qt_lib_cargo_tests)$'
             exe_suffix: .exe
             qt_qpa_platform: windows
             compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache

crates/cxx-qt-gen/src/lib.rs

@@ -73,6 +73,11 @@ mod tests {
         syn::parse2(tokens.into_token_stream()).unwrap()
     }
 
+    fn sanitize_code(mut code: String) -> String {
+        code.retain(|c| c != '\r');
+        code
+    }
+
     /// Helper for testing if a given input Rust file generates the expected C++ & Rust code
     /// This needs to be a macro rather than a function because include_str needs the file path at compile time.
     macro_rules! test_code_generation {
@@ -86,25 +91,31 @@ mod tests {
             let generated_cpp = GeneratedCppBlocks::from(&parser).unwrap();
             let (header, source) =
                 if let CppFragment::Pair { header, source } = write_cpp(&generated_cpp) {
-                    (header, source)
+                    (sanitize_code(header), sanitize_code(source))
                 } else {
                     panic!("Expected CppFragment::Pair")
                 };
             let expected_cpp_header =
-                clang_format(include_str!(concat!("../test_outputs/", $file_stem, ".h"))).unwrap();
+                clang_format(include_str!(concat!("../test_outputs/", $file_stem, ".h")))
+                    .map(sanitize_code)
+                    .unwrap();
             let expected_cpp_source = clang_format(include_str!(concat!(
                 "../test_outputs/",
                 $file_stem,
                 ".cpp"
             )))
+            .map(sanitize_code)
             .unwrap();
             assert_str_eq!(header, expected_cpp_header);
             assert_str_eq!(source, expected_cpp_source);
 
             let generated_rust = GeneratedRustBlocks::from(&parser).unwrap();
-            let rust = format_rs_source(&write_rust(&generated_rust).to_string());
-            let expected_rust_output =
-                format_rs_source(include_str!(concat!("../test_outputs/", $file_stem, ".rs")));
+            let rust = sanitize_code(format_rs_source(&write_rust(&generated_rust).to_string()));
+            let expected_rust_output = sanitize_code(format_rs_source(include_str!(concat!(
+                "../test_outputs/",
+                $file_stem,
+                ".rs"
+            ))));
             assert_str_eq!(rust, expected_rust_output);
         };
     }