mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Provide local paths for file tests. (#2830)
The intent of this change is that instead of paths looking like `explorer/testdata/foo/bar.carbon` (repo-relative), they're now just `bar.carbon` (local). The consequence is that paths should be a bit more durable in various environments, and just paths should be shorter and easier to read. The explorer's prelude is an exception to this since it comes from data, rather than being the test target. Due to the change in approaches, it needs the regex again. Uses #2829
This commit is contained in:
+1
-1
@@ -12,7 +12,7 @@ interface A {
|
||||
}
|
||||
|
||||
external impl i32 as A {
|
||||
// CHECK:STDERR: SYNTAX ERROR: explorer/testdata/impl/fail_bad_member_kind.carbon:[[@LINE+1]]: syntax error, unexpected CLASS
|
||||
// CHECK:STDERR: SYNTAX ERROR: fail_bad_member_kind.carbon:[[@LINE+1]]: syntax error, unexpected CLASS
|
||||
class T {}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
|
||||
package ExplorerTest api;
|
||||
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_impl_as.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32
|
||||
external impl i32 as i32 {}
|
||||
|
||||
fn Main() -> i32 {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
package ExplorerTest api;
|
||||
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as_non_interface.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found String
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_impl_as_non_interface.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found String
|
||||
external impl i32 as String {}
|
||||
|
||||
fn Main() -> i32 {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
package ExplorerTest api;
|
||||
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as_not_constraint.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_impl_as_not_constraint.carbon:[[@LINE+1]]: expected a constraint in impl declaration, found i32
|
||||
external impl i32 as i32 {}
|
||||
|
||||
fn Main() -> i32 {
|
||||
|
||||
@@ -9,7 +9,7 @@ package ExplorerTest api;
|
||||
interface Vector(Scalar:! type) {
|
||||
}
|
||||
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_as_parameterized.carbon:[[@LINE+1]]: 'Vector' must be given an argument list
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_impl_as_parameterized.carbon:[[@LINE+1]]: 'Vector' must be given an argument list
|
||||
external impl i32 as Vector {}
|
||||
|
||||
fn Main() -> i32 {
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ external impl Point as Vector {
|
||||
fn Scale[self: Point](v: i32) -> Point {
|
||||
return {.x = self.x * v, .y = self.y * v};
|
||||
}
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_impl_redefinition.carbon:[[@LINE+1]]: ambiguous implementations of interface Vector for class Point
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_impl_redefinition.carbon:[[@LINE+1]]: ambiguous implementations of interface Vector for class Point
|
||||
}
|
||||
|
||||
fn AddAndScaleGeneric[T:! Vector](a: T, b: T, s: i32) -> T {
|
||||
|
||||
@@ -9,7 +9,7 @@ package ExplorerTest api;
|
||||
interface A(T:! type) {}
|
||||
interface B {}
|
||||
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_nondeducible_parameter.carbon:[[@LINE+1]]: parameter `T:! type` is not deducible from `impl i32 as interface B`
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_nondeducible_parameter.carbon:[[@LINE+1]]: parameter `T:! type` is not deducible from `impl i32 as interface B`
|
||||
external impl forall [T:! type] i32 as A(T) & B {}
|
||||
|
||||
fn Main() -> i32 { return 0; }
|
||||
|
||||
@@ -17,7 +17,7 @@ fn Main() -> i32 {
|
||||
let n: i32 = 0;
|
||||
CheckSimilar(true, false);
|
||||
CheckSimilar(true, n);
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_param_interface_in_impl.carbon:[[@LINE+1]]: could not find implementation of interface Similar(T = i32) for bool
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_param_interface_in_impl.carbon:[[@LINE+1]]: could not find implementation of interface Similar(T = i32) for bool
|
||||
CheckSimilar(n, false);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ package ExplorerTest api;
|
||||
interface A {}
|
||||
interface B {}
|
||||
|
||||
// CHECK:STDERR: COMPILATION ERROR: explorer/testdata/impl/fail_unmet_impls_constraint.carbon:[[@LINE+1]]: could not find implementation of interface B for i32
|
||||
// CHECK:STDERR: COMPILATION ERROR: fail_unmet_impls_constraint.carbon:[[@LINE+1]]: could not find implementation of interface B for i32
|
||||
external impl i32 as A where i32 impls B {}
|
||||
|
||||
fn Main() -> i32 {
|
||||
|
||||
Reference in New Issue
Block a user