From 9e4f17bb611a6d1ddbe1f15622b4c24583395546 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 17 Jun 2020 10:01:35 -0700 Subject: [PATCH 1/3] Fix coverage test on Windows Relying on $PWD made this invalid on Windows --- test/Profiler/coverage_relative_path.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Profiler/coverage_relative_path.swift b/test/Profiler/coverage_relative_path.swift index b6b1db136dd9a..0cb9c38856847 100644 --- a/test/Profiler/coverage_relative_path.swift +++ b/test/Profiler/coverage_relative_path.swift @@ -5,11 +5,11 @@ // RUN: cp %s %t/foo/bar/baz/coverage_relative_path.swift // RUN: cd %t/foo/bar -// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -emit-ir baz/coverage_relative_path.swift | %FileCheck -check-prefix=ABSOLUTE %s +// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -emit-ir %/S/baz/coverage_relative_path.swift | %FileCheck -check-prefix=ABSOLUTE %s // // ABSOLUTE: @__llvm_coverage_mapping = {{.*"\\01.*foo.*bar.*baz.*coverage_relative_path\.swift}} -// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -coverage-prefix-map $PWD=. -emit-ir baz/coverage_relative_path.swift | %FileCheck -check-prefix=RELATIVE %s +// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -coverage-prefix-map %/S=. -emit-ir %/S/baz/coverage_relative_path.swift | %FileCheck -check-prefix=RELATIVE %s // // RELATIVE: @__llvm_coverage_mapping = {{.*"\\01[^/]*}}.{{/|\\}}baz{{.*coverage_relative_path\.swift}} From 48f9f2d06b11f9a08e59b0c9a3caf6d30916b64b Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 17 Jun 2020 10:24:35 -0700 Subject: [PATCH 2/3] Use %t --- test/Profiler/coverage_relative_path.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Profiler/coverage_relative_path.swift b/test/Profiler/coverage_relative_path.swift index 0cb9c38856847..fd8cd7dfe83fa 100644 --- a/test/Profiler/coverage_relative_path.swift +++ b/test/Profiler/coverage_relative_path.swift @@ -5,11 +5,11 @@ // RUN: cp %s %t/foo/bar/baz/coverage_relative_path.swift // RUN: cd %t/foo/bar -// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -emit-ir %/S/baz/coverage_relative_path.swift | %FileCheck -check-prefix=ABSOLUTE %s +// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -emit-ir %/t/foo/bar/baz/coverage_relative_path.swift | %FileCheck -check-prefix=ABSOLUTE %s // // ABSOLUTE: @__llvm_coverage_mapping = {{.*"\\01.*foo.*bar.*baz.*coverage_relative_path\.swift}} -// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -coverage-prefix-map %/S=. -emit-ir %/S/baz/coverage_relative_path.swift | %FileCheck -check-prefix=RELATIVE %s +// RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -coverage-prefix-map %/t/foo/bar=. -emit-ir %/t/foo/bar/baz/coverage_relative_path.swift | %FileCheck -check-prefix=RELATIVE %s // // RELATIVE: @__llvm_coverage_mapping = {{.*"\\01[^/]*}}.{{/|\\}}baz{{.*coverage_relative_path\.swift}} From 19477fd4b7642e3dbedac9c99c95e6ac6b86dbf6 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 17 Jun 2020 10:45:47 -0700 Subject: [PATCH 3/3] swap to echo to work on windwos --- test/Profiler/coverage_relative_path.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Profiler/coverage_relative_path.swift b/test/Profiler/coverage_relative_path.swift index fd8cd7dfe83fa..2e5683b382abf 100644 --- a/test/Profiler/coverage_relative_path.swift +++ b/test/Profiler/coverage_relative_path.swift @@ -2,7 +2,7 @@ // clean directory, put the source there, and cd into it. // RUN: rm -rf %t // RUN: mkdir -p %t/foo/bar/baz -// RUN: cp %s %t/foo/bar/baz/coverage_relative_path.swift +// RUN: echo "func coverage() {}" > %t/foo/bar/baz/coverage_relative_path.swift // RUN: cd %t/foo/bar // RUN: %target-swift-frontend -profile-generate -profile-coverage-mapping -Xllvm -enable-name-compression=false -emit-ir %/t/foo/bar/baz/coverage_relative_path.swift | %FileCheck -check-prefix=ABSOLUTE %s