File tree Expand file tree Collapse file tree 4 files changed +32
-14
lines changed Expand file tree Collapse file tree 4 files changed +32
-14
lines changed Original file line number Diff line number Diff line change 1
- //RUN: rm -rf %t*
2
- //RUN: not 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes1b.c -- 2>%t.stderr
3
- //RUN: grep -q "merging failed" %t.stderr
1
+ // Since the RUN commands in difftypes1a.c and difftypes1b.c process the two
2
+ // files in different orders and the location where the error is reported
3
+ // depends on the order, we need to use a different diagnostic verification
4
+ // prefix (and set of corresponding comments) for each RUN command.
4
5
5
- // The desired behavior in this case is to fail, so other checks are omitted
6
+ //RUN: rm -rf %t*
7
+ //RUN: 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes1b.c -- -Xclang -verify=ab-expected
6
8
9
+ // ab-expected-no-diagnostics
10
+ // ba-expected-error@+1 {{merging failed for 'foo'}}
7
11
_Ptr < int > foo (int , char ) ;
Original file line number Diff line number Diff line change 1
- //RUN: rm -rf %t*
2
- //RUN: not 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes1a.c -- 2>%t.stderr
3
- //RUN: grep -q "merging failed" %t.stderr
1
+ // Since the RUN commands in difftypes1a.c and difftypes1b.c process the two
2
+ // files in different orders and the location where the error is reported
3
+ // depends on the order, we need to use a different diagnostic verification
4
+ // prefix (and set of corresponding comments) for each RUN command.
4
5
5
- // The desired behavior in this case is to fail, so other checks are omitted
6
+ //RUN: rm -rf %t*
7
+ //RUN: 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes1a.c -- -Xclang -verify=ba-expected
6
8
9
+ // ba-expected-no-diagnostics
10
+ // ab-expected-error@+1 {{merging failed for 'foo'}}
7
11
int * foo (int , char * );
Original file line number Diff line number Diff line change
1
+ // Since the RUN commands in difftypes2a.c and difftypes2b.c process the two
2
+ // files in different orders and the location where the error is reported
3
+ // depends on the order, we need to use a different diagnostic verification
4
+ // prefix (and set of corresponding comments) for each RUN command.
5
+
1
6
// RUN: rm -rf %t*
2
- // RUN: not 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes2b.c -- 2>%t.stderr
3
- // RUN: grep -q "merging failed" %t.stderr
7
+ // RUN: 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes2b.c -- -Xclang -verify=ab-expected
4
8
5
9
// The desired behavior in this case is to fail, so other checks are omitted
6
10
7
11
// Test no body vs body
8
12
13
+ // ab-expected-no-diagnostics
14
+ // ba-expected-error@+1 {{merging failed for 'foo'}}
9
15
void foo (char * x );
Original file line number Diff line number Diff line change 1
- // RUN: rm -rf %t*
2
- // RUN: not 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes2a.c -- 2>%t.stderr
3
- // RUN: grep -q "merging failed" %t.stderr
1
+ // Since the RUN commands in difftypes2a.c and difftypes2b.c process the two
2
+ // files in different orders and the location where the error is reported
3
+ // depends on the order, we need to use a different diagnostic verification
4
+ // prefix (and set of corresponding comments) for each RUN command.
4
5
5
- // The desired behavior in this case is to fail, so other checks are omitted
6
+ // RUN: rm -rf %t*
7
+ // RUN: 3c -base-dir=%S -output-dir=%t.checked %s %S/difftypes2a.c -- -Xclang -verify=ba-expected
6
8
7
9
// Test body vs no body
8
10
11
+ // ba-expected-no-diagnostics
12
+ // ab-expected-error@+1 {{merging failed for 'foo'}}
9
13
void foo (char * * y ) {
10
14
// this is the body
11
15
}
You can’t perform that action at this time.
0 commit comments