From 130a02e7055c31f06d88e874dfbc20db083f0301 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 22 Jun 2020 10:56:55 -0700 Subject: [PATCH] tests: loosen overly-restrictive test patterns Admit different path separators in DebugInfo tests. These will be used in subsequent changes that enable the directory module layout on non-Darwin platforms. --- test/DebugInfo/Imports.swift | 2 +- test/DebugInfo/variables.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/DebugInfo/Imports.swift b/test/DebugInfo/Imports.swift index 5ba4bfe8eab22..0beaaf35e429f 100644 --- a/test/DebugInfo/Imports.swift +++ b/test/DebugInfo/Imports.swift @@ -8,7 +8,7 @@ // CHECK-DAG: ![[FOOMODULE:[0-9]+]] = !DIModule({{.*}}, name: "Foo", includePath: "{{.*}}test{{.*}}DebugInfo{{.*}}" // CHECK-DAG: !DIImportedEntity(tag: DW_TAG_imported_module, scope: ![[THISFILE:[0-9]+]], entity: ![[FOOMODULE]] // CHECK-DAG: ![[THISFILE]] = !DIFile(filename: "{{.*}}test{{/|\\\\}}DebugInfo{{/|\\\\}}Imports.swift", -// CHECK-DAG: ![[SWIFTFILE:[0-9]+]] = !DIFile(filename: "{{.*}}Swift.swiftmodule{{(/.+[.]swiftmodule)?}}" +// CHECK-DAG: ![[SWIFTFILE:[0-9]+]] = !DIFile(filename: "{{.*}}Swift.swiftmodule{{([/\\].+[.]swiftmodule)?}}" // CHECK-DAG: ![[SWIFTMODULE:[0-9]+]] = !DIModule({{.*}}, name: "Swift" // CHECK-DAG: !DIImportedEntity(tag: DW_TAG_imported_module, scope: ![[THISFILE]], entity: ![[SWIFTMODULE]] // CHECK-DAG: ![[BASICMODULE:[0-9]+]] = !DIModule({{.*}}, name: "basic" diff --git a/test/DebugInfo/variables.swift b/test/DebugInfo/variables.swift index 196802e6f8df5..502c91e04f18a 100644 --- a/test/DebugInfo/variables.swift +++ b/test/DebugInfo/variables.swift @@ -41,7 +41,7 @@ print(", \(glob_b)", terminator: "") print(", \(glob_s)", terminator: "") var unused: Int32 = -1 -// CHECK-DAG: ![[RT:[0-9]+]] ={{.*}}"{{.*}}Swift.swiftmodule{{(/.+[.]swiftmodule)?}}" +// CHECK-DAG: ![[RT:[0-9]+]] ={{.*}}"{{.*}}Swift.swiftmodule{{([/\\].+[.]swiftmodule)?}}" // Stack variables.