From 10bb0a361cf0756d5d1c9f0df582c55c464a0540 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Thu, 13 Feb 2020 16:01:32 +0300 Subject: [PATCH] The output of the library mismatch tests should check for contains of expected gold output instead of equals to prevent false positive failures related to IR validation warnings. --- backend.native/tests/build.gradle | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index b2ee87a93c9..349494f36c6 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -3726,7 +3726,12 @@ task library_mismatch(type: KonanDriverTest) { "warning: skipping $dir/1.2/empty.klib. The library versions don't match. Expected '5.6', found '1.2'\n" + "warning: skipping $dir/3.4/empty.klib. The target doesn't match. Expected '$currentTarget', found [$someOtherTarget]\n" + "Hello, versioned world!\n" - goldValue = isWindows() ? messages.replaceAll('\\/', '\\\\') : messages + goldValue = PlatformInfo.isWindows() ? messages.replaceAll('\\/', '\\\\') : messages + outputChecker = { out -> + goldValue.split("\n") + .collect { line -> out.contains(line) } + .every { it == true } + } } task library_ir_provider_mismatch(type: KonanDriverTest) { @@ -3749,7 +3754,12 @@ task library_ir_provider_mismatch(type: KonanDriverTest) { def messages = "warning: skipping $dir/unsupported_ir_provider/empty.klib. The library requires unknown IR provider UNSUPPORTED.\n" + "hello\n" - goldValue = isWindows() ? messages.replaceAll('\\/', '\\\\') : messages + goldValue = PlatformInfo.isWindows() ? messages.replaceAll('\\/', '\\\\') : messages + outputChecker = { out -> + goldValue.split("\n") + .collect { line -> out.contains(line) } + .every { it == true } + } } if (isAppleTarget(project)) {