From a8334dba30b4dfc018d3b4cfbadee51cbc9f6fff Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 26 Mar 2020 14:53:23 -0700 Subject: [PATCH] test: fix after 45dc14a27501 Fix the tests after 45dc14a27501. --- test/Index/Store/cross-import-overlay.swift | 48 ++++++++++----------- test/Index/index_cross_import.swift | 20 ++++----- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/test/Index/Store/cross-import-overlay.swift b/test/Index/Store/cross-import-overlay.swift index 20c8c1c69a0c4..218186daa7c91 100644 --- a/test/Index/Store/cross-import-overlay.swift +++ b/test/Index/Store/cross-import-overlay.swift @@ -29,65 +29,65 @@ from__ABAdditionsCAdditions() // MAIN-NEXT: target: {{.*}} // MAIN-NEXT: is-debug: 1 // MAIN-NEXT: DEPEND START -// MAIN-NEXT: Unit | system | Swift | {{.*}}/Swift.swiftmodule -// MAIN-NEXT: Unit | system | B | {{.*}}/B.swiftmodule/{{.*}} -// MAIN-NEXT: Unit | system | C | {{.*}}/C.swiftmodule/{{.*}} -// MAIN-NEXT: Unit | system | A | {{.*}}/__ABAdditionsCAdditions.swiftmodule/{{.*}} -// MAIN-NEXT: Record | user | {{.*}}/cross-import-overlay.swift +// MAIN-NEXT: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule +// MAIN-NEXT: Unit | system | B | {{.*}}{{/|\\}}B.swiftmodule{{/|\\}}{{.*}} +// MAIN-NEXT: Unit | system | C | {{.*}}{{/|\\}}C.swiftmodule{{/|\\}}{{.*}} +// MAIN-NEXT: Unit | system | A | {{.*}}{{/|\\}}__ABAdditionsCAdditions.swiftmodule{{/|\\}}{{.*}} +// MAIN-NEXT: Record | user | {{.*}}{{/|\\}}cross-import-overlay.swift // MAIN-NEXT: DEPEND END // // RUN: %FileCheck %s --input-file %t/units --check-prefix=AB_OVERLAY // AB_OVERLAY: module-name: A -// AB_OVERLAY: out-file:{{.*}}/_ABAdditions.swiftmodule/{{.*}} +// AB_OVERLAY: out-file:{{.*}}{{/|\\}}_ABAdditions.swiftmodule{{/|\\}}{{.*}} // AB_OVERLAY-NEXT: target: {{.*}} // AB_OVERLAY-NEXT: is-debug: 1 // AB_OVERLAY-NEXT: DEPEND START -// AB_OVERLAY-NEXT: Unit | system | A | {{.*}}/A.swiftmodule/{{.*}} -// AB_OVERLAY-NEXT: Unit | system | B | {{.*}}/B.swiftmodule/{{.*}} -// AB_OVERLAY-NEXT: Unit | system | Swift | {{.*}}/Swift.swiftmodule -// AB_OVERLAY-NEXT: Record | system | A | {{.*}}/_ABAdditions.swiftmodule/{{.*}} +// AB_OVERLAY-NEXT: Unit | system | A | {{.*}}{{/|\\}}A.swiftmodule{{/|\\}}{{.*}} +// AB_OVERLAY-NEXT: Unit | system | B | {{.*}}{{/|\\}}B.swiftmodule{{/|\\}}{{.*}} +// AB_OVERLAY-NEXT: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule +// AB_OVERLAY-NEXT: Record | system | A | {{.*}}{{/|\\}}_ABAdditions.swiftmodule{{/|\\}}{{.*}} // AB_OVERLAY-NEXT: DEPEND END // // RUN: %FileCheck %s --input-file %t/units --check-prefix=ABC_OVERLAY // ABC_OVERLAY: module-name: A -// ABC_OVERLAY: out-file: {{.*}}/__ABAdditionsCAdditions.swiftmodule/{{.*}} +// ABC_OVERLAY: out-file: {{.*}}{{/|\\}}__ABAdditionsCAdditions.swiftmodule{{/|\\}}{{.*}} // ABC_OVERLAY-NEXT: target: {{.*}} // ABC_OVERLAY-NEXT: is-debug: 1 // ABC_OVERLAY-NEXT: DEPEND START -// ABC_OVERLAY-NEXT: Unit | system | C | {{.*}}/C.swiftmodule/{{.*}} -// ABC_OVERLAY-NEXT: Unit | system | Swift | {{.*}}/Swift.swiftmodule -// ABC_OVERLAY-NEXT: Unit | system | A | {{.*}}/_ABAdditions.swiftmodule/{{.*}} -// ABC_OVERLAY-NEXT: Record | system | A | {{.*}}/__ABAdditionsCAdditions.swiftmodule/{{.*}} +// ABC_OVERLAY-NEXT: Unit | system | C | {{.*}}{{/|\\}}C.swiftmodule{{/|\\}}{{.*}} +// ABC_OVERLAY-NEXT: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule +// ABC_OVERLAY-NEXT: Unit | system | A | {{.*}}{{/|\\}}_ABAdditions.swiftmodule{{/|\\}}{{.*}} +// ABC_OVERLAY-NEXT: Record | system | A | {{.*}}{{/|\\}}__ABAdditionsCAdditions.swiftmodule{{/|\\}}{{.*}} // ABC_OVERLAY-NEXT: DEPEND END // // RUN: %FileCheck %s --input-file %t/units --check-prefix=C_MODULE // C_MODULE: module-name: C -// C_MODULE: out-file: {{.*}}/C.swiftmodule/{{.*}} +// C_MODULE: out-file: {{.*}}{{/|\\}}C.swiftmodule{{/|\\}}{{.*}} // C_MODULE-NEXT: target: {{.*}} // C_MODULE-NEXT: is-debug: 1 // C_MODULE-NEXT: DEPEND START -// C_MODULE-NEXT: Unit | system | Swift | {{.*}}/Swift.swiftmodule -// C_MODULE-NEXT: Record | system | C | {{.*}}/C.swiftmodule/{{.*}} +// C_MODULE-NEXT: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule +// C_MODULE-NEXT: Record | system | C | {{.*}}{{/|\\}}C.swiftmodule{{/|\\}}{{.*}} // C_MODULE-NEXT: DEPEND END // // RUN: %FileCheck %s --input-file %t/units --check-prefix=B_MODULE // B_MODULE: module-name: B -// B_MODULE: out-file: {{.*}}/B.swiftmodule/{{.*}} +// B_MODULE: out-file: {{.*}}{{/|\\}}B.swiftmodule{{/|\\}}{{.*}} // B_MODULE-NEXT: target: {{.*}} // B_MODULE-NEXT: is-debug: 1 // B_MODULE-NEXT: DEPEND START -// B_MODULE-NEXT: Unit | system | Swift | {{.*}}/Swift.swiftmodule -// B_MODULE-NEXT: Record | system | B | {{.*}}/B.swiftmodule/{{.*}} +// B_MODULE-NEXT: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule +// B_MODULE-NEXT: Record | system | B | {{.*}}{{/|\\}}B.swiftmodule{{/|\\}}{{.*}} // B_MODULE-NEXT: DEPEND END // // RUN: %FileCheck %s --input-file %t/units --check-prefix=A_MODULE // A_MODULE: module-name: A -// A_MODULE: out-file: {{.*}}/A.swiftmodule/{{.*}} +// A_MODULE: out-file: {{.*}}{{/|\\}}A.swiftmodule{{/|\\}}{{.*}} // A_MODULE-NEXT: target: {{.*}} // A_MODULE-NEXT: is-debug: 1 // A_MODULE-NEXT: DEPEND START -// A_MODULE-NEXT: Unit | system | Swift | {{.*}}/Swift.swiftmodule -// A_MODULE-NEXT: Record | system | A | {{.*}}/A.swiftmodule/{{.*}} +// A_MODULE-NEXT: Unit | system | Swift | {{.*}}{{/|\\}}Swift.swiftmodule +// A_MODULE-NEXT: Record | system | A | {{.*}}{{/|\\}}A.swiftmodule{{/|\\}}{{.*}} // A_MODULE-NEXT: DEPEND END diff --git a/test/Index/index_cross_import.swift b/test/Index/index_cross_import.swift index b4dc7f683ebe8..f41c67d3acf57 100644 --- a/test/Index/index_cross_import.swift +++ b/test/Index/index_cross_import.swift @@ -11,21 +11,21 @@ // // CHECK: index_cross_import.swift // CHECK: ------------ -// CHECK-DAG: module | user | A | {{.*}}/A.swiftmodule/{{.*}} -// CHECK-DAG: module | user | A | {{.*}}/_ABAdditions.swiftmodule/{{.*}} -// CHECK-DAG: module | user | A | {{.*}}/__ABAdditionsCAdditions.swiftmodule/{{.*}} -// CHECK-DAG: module | user | B | {{.*}}/B.swiftmodule/{{.*}} -// CHECK-DAG: module | user | C | {{.*}}/C.swiftmodule/{{.*}} +// CHECK-DAG: module | user | A | {{.*}}{{/|\\}}A.swiftmodule{{/|\\}}{{.*}} +// CHECK-DAG: module | user | A | {{.*}}{{/|\\}}_ABAdditions.swiftmodule{{/|\\}}{{.*}} +// CHECK-DAG: module | user | A | {{.*}}{{/|\\}}__ABAdditionsCAdditions.swiftmodule{{/|\\}}{{.*}} +// CHECK-DAG: module | user | B | {{.*}}{{/|\\}}B.swiftmodule{{/|\\}}{{.*}} +// CHECK-DAG: module | user | C | {{.*}}{{/|\\}}C.swiftmodule{{/|\\}}{{.*}} // CHECK: ------------ import A -// CHECK: [[@LINE-1]]:8 | module/Swift | A | {{.*}} | Ref | rel: 0 +// CHECK: [[@LINE-1]]:8 | module{{/|\\}}Swift | A | {{.*}} | Ref | rel: 0 import B -// CHECK: [[@LINE-1]]:8 | module/Swift | B | {{.*}} | Ref | rel: 0 +// CHECK: [[@LINE-1]]:8 | module{{/|\\}}Swift | B | {{.*}} | Ref | rel: 0 import C -// CHECK: [[@LINE-1]]:8 | module/Swift | C | {{.*}} | Ref | rel: 0 +// CHECK: [[@LINE-1]]:8 | module{{/|\\}}Swift | C | {{.*}} | Ref | rel: 0 from_ABAdditions() -// CHECK: [[@LINE-1]]:1 | function/Swift | from_ABAdditions() | {{.*}} | Ref,Call | rel: 0 +// CHECK: [[@LINE-1]]:1 | function{{/|\\}}Swift | from_ABAdditions() | {{.*}} | Ref,Call | rel: 0 from__ABAdditionsCAdditions() -// CHECK: [[@LINE-1]]:1 | function/Swift | from__ABAdditionsCAdditions() | {{.*}} | Ref,Call | rel: 0 +// CHECK: [[@LINE-1]]:1 | function{{/|\\}}Swift | from__ABAdditionsCAdditions() | {{.*}} | Ref,Call | rel: 0