Skip to content

Commit 42561d0

Browse files
michalpasztamobicabryanpkc
authored andcommitted
Allow full path to flang1 and flang2 in classic flang tests.
1 parent 48bdbc1 commit 42561d0

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

clang/test/Driver/flang/classic-flang-must-preprocess.F

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
! RUN: %clang --driver-mode=flang -target x86_64-unknown-linux-gnu -c %s -### 2>&1 \
77
! RUN: | FileCheck %s
8-
! CHECK: "flang1"
8+
! CHECK: "{{.*}}flang1"
99
! CHECK-SAME: "-preprocess"
1010
! CHECK-SAME: "-nofreeform"
11-
! CHECK-NEXT: "flang2"
11+
! CHECK-NEXT: "{{.*}}flang2"
1212
! CHECK-NEXT: {{clang.* "-cc1"}}

clang/test/Driver/flang/classic-flang-must-preprocess.F95

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
! RUN: %clang --driver-mode=flang -target x86_64-unknown-linux-gnu -c %s -### 2>&1 \
77
! RUN: | FileCheck %s
8-
! CHECK: "flang1"
8+
! CHECK: "{{.*}}flang1"
99
! CHECK-SAME: "-preprocess"
1010
! CHECK-SAME: "-freeform"
11-
! CHECK-NEXT: "flang2"
11+
! CHECK-NEXT: "{{.*}}flang2"
1212
! CHECK-NEXT: {{clang.* "-cc1"}}

clang/test/Driver/flang/classic-flang.f

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55

66
! RUN: %clang --driver-mode=flang -target x86_64-unknown-linux-gnu -c %s -### 2>&1 \
77
! RUN: | FileCheck %s
8-
! CHECK: "flang1"
8+
! CHECK: "{{.*}}flang1"
99
! CHECK-NOT: "-preprocess"
1010
! CHECK-SAME: "-nofreeform"
11-
! CHECK-NEXT: "flang2"
11+
! CHECK-NEXT: "{{.*}}flang2"
1212
! CHECK-NEXT: {{clang.* "-cc1"}}
1313

1414
! Check that the driver invokes flang1 correctly when preprocessing is
1515
! explicitly requested.
1616

1717
! RUN: %clang --driver-mode=flang -target x86_64-unknown-linux-gnu -E %s -### 2>&1 \
1818
! RUN: | FileCheck --check-prefix=CHECK-PREPROCESS %s
19-
! CHECK-PREPROCESS: "flang1"
19+
! CHECK-PREPROCESS: "{{.*}}flang1"
2020
! CHECK-PREPROCESS-SAME: "-preprocess"
2121
! CHECK-PREPROCESS-SAME: "-es"
2222
! CHECK-PREPROCESS-SAME: "-pp"
23-
! CHECK-PREPROCESS-NOT: "flang1"
24-
! CHECK-PREPROCESS-NOT: "flang2"
23+
! CHECK-PREPROCESS-NOT: "{{.*}}flang1"
24+
! CHECK-PREPROCESS-NOT: "{{.*}}flang2"
2525
! CHECK-PREPROCESS-NOT: {{clang.* "-cc1"}}
2626
! CHECK-PREPROCESS-NOT: {{clang.* "-cc1as"}}

clang/test/Driver/flang/classic-flang.f95

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
! RUN: %clang --driver-mode=flang -target x86_64-unknown-linux-gnu -c %s -### 2>&1 \
77
! RUN: | FileCheck --check-prefix=CHECK-OBJECT %s
8-
! CHECK-OBJECT: "flang1"
8+
! CHECK-OBJECT: "{{.*}}flang1"
99
! CHECK-OBJECT-NOT: "-preprocess"
1010
! CHECK-OBJECT-SAME: "-freeform"
11-
! CHECK-OBJECT-NEXT: "flang2"
11+
! CHECK-OBJECT-NEXT: "{{.*}}flang2"
1212
! CHECK-OBJECT-SAME: "-asm" [[LLFILE:.*.ll]]
1313
! CHECK-OBJECT-NEXT: {{clang.* "-cc1"}}
1414
! CHECK-OBJECT-SAME: "-o" "classic-flang.o"
@@ -20,12 +20,12 @@
2020

2121
! RUN: %clang --driver-mode=flang -target x86_64-unknown-linux-gnu -E %s -### 2>&1 \
2222
! RUN: | FileCheck --check-prefix=CHECK-PREPROCESS %s
23-
! CHECK-PREPROCESS: "flang1"
23+
! CHECK-PREPROCESS: "{{.*}}flang1"
2424
! CHECK-PREPROCESS-SAME: "-preprocess"
2525
! CHECK-PREPROCESS-SAME: "-es"
2626
! CHECK-PREPROCESS-SAME: "-pp"
27-
! CHECK-PREPROCESS-NOT: "flang1"
28-
! CHECK-PREPROCESS-NOT: "flang2"
27+
! CHECK-PREPROCESS-NOT: "{{.*}}flang1"
28+
! CHECK-PREPROCESS-NOT: "{{.*}}flang2"
2929
! CHECK-PREPROCESS-NOT: {{clang.* "-cc1"}}
3030
! CHECK-PREPROCESS-NOT: {{clang.* "-cc1as"}}
3131

@@ -34,8 +34,8 @@
3434

3535
! RUN: %clang --driver-mode=flang -target x86_64-unknown-linux-gnu -integrated-as -S %s -### 2>&1 \
3636
! RUN: | FileCheck --check-prefix=CHECK-ASM %s
37-
! CHECK-ASM: "flang1"
38-
! CHECK-ASM-NEXT: "flang2"
37+
! CHECK-ASM: "{{.*}}flang1"
38+
! CHECK-ASM-NEXT: "{{.*}}flang2"
3939
! CHECK-ASM-SAME: "-asm" [[LLFILE:.*.ll]]
4040
! CHECK-ASM-NEXT: {{clang.* "-cc1"}}
4141
! CHECK-ASM-SAME: "-o" "classic-flang.s"

0 commit comments

Comments
 (0)