From 4017049e87d6acef6cfb4fa3de94c1e519316a04 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Tue, 7 Jan 2020 22:25:49 +0100 Subject: [PATCH] UTIL: attempt to fix the newline problem with gitattributes --- data/testutil/.gitattributes | 1 + src/modules/util/tests/IncludeUtilTest.cpp | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) create mode 100644 data/testutil/.gitattributes diff --git a/data/testutil/.gitattributes b/data/testutil/.gitattributes new file mode 100644 index 000000000..6e4f5d261 --- /dev/null +++ b/data/testutil/.gitattributes @@ -0,0 +1 @@ +*.h text eol=lf diff --git a/src/modules/util/tests/IncludeUtilTest.cpp b/src/modules/util/tests/IncludeUtilTest.cpp index 627f1db1e..4e4258fe8 100644 --- a/src/modules/util/tests/IncludeUtilTest.cpp +++ b/src/modules/util/tests/IncludeUtilTest.cpp @@ -6,12 +6,6 @@ #include "util/IncludeUtil.h" #include -#ifdef __WINDOWS__ -#define NEWLINE "\r\n" -#else -#define NEWLINE "\n" -#endif - class IncludeUtilTest : public core::AbstractTest { }; @@ -23,9 +17,9 @@ TEST_F(IncludeUtilTest, testInclude) { std::pair retIncludes = util::handleIncludes(src, includeDirs, &includedFiles); EXPECT_TRUE(retIncludes.second); EXPECT_EQ(2u, includedFiles.size()); - EXPECT_EQ("#error \"one\"" NEWLINE "#include \"two.h\"" NEWLINE NEWLINE "#error \"two\"" NEWLINE NEWLINE, retIncludes.first); + EXPECT_EQ("#error \"one\"\n#include \"two.h\"\n\n#error \"two\"\n\n", retIncludes.first); retIncludes = util::handleIncludes(retIncludes.first, includeDirs, &includedFiles); EXPECT_TRUE(retIncludes.second); EXPECT_EQ(3u, includedFiles.size()); - EXPECT_EQ("#error \"one\"" NEWLINE "#error \"two\"" NEWLINE NEWLINE NEWLINE "#error \"two\"" NEWLINE NEWLINE, retIncludes.first); + EXPECT_EQ("#error \"one\"\n#error \"two\"\n\n\n#error \"two\"\n\n", retIncludes.first); }