diff options
Diffstat (limited to 'dhall/src')
| -rw-r--r-- | dhall/src/phase/resolve.rs | 4 | ||||
| -rw-r--r-- | dhall/src/phase/typecheck.rs | 8 | ||||
| -rw-r--r-- | dhall/src/tests.rs | 10 |
3 files changed, 8 insertions, 14 deletions
diff --git a/dhall/src/phase/resolve.rs b/dhall/src/phase/resolve.rs index fa5f32e..c4d7e5f 100644 --- a/dhall/src/phase/resolve.rs +++ b/dhall/src/phase/resolve.rs @@ -110,13 +110,13 @@ mod spec_tests { macro_rules! import_success { ($name:ident, $path:expr) => { - make_spec_test!(Import, Success, $name, $path); + make_spec_test!(Import, Success, $name, &("success/".to_owned() + $path)); }; } // macro_rules! import_failure { // ($name:ident, $path:expr) => { - // make_spec_test!(Import, Failure, $name, $path); + // make_spec_test!(Import, Failure, $name, &("failure/".to_owned() + $path)); // }; // } diff --git a/dhall/src/phase/typecheck.rs b/dhall/src/phase/typecheck.rs index ac584cd..bb36060 100644 --- a/dhall/src/phase/typecheck.rs +++ b/dhall/src/phase/typecheck.rs @@ -787,23 +787,23 @@ mod spec_tests { macro_rules! tc_success { ($name:ident, $path:expr) => { - make_spec_test!(Typecheck, Success, $name, $path); + make_spec_test!(Typecheck, Success, $name, &("success/".to_owned() + $path)); }; } macro_rules! tc_failure { ($name:ident, $path:expr) => { - make_spec_test!(Typecheck, Failure, $name, $path); + make_spec_test!(Typecheck, Failure, $name, &("failure/".to_owned() + $path)); }; } macro_rules! ti_success { ($name:ident, $path:expr) => { - make_spec_test!(TypeInference, Success, $name, $path); + make_spec_test!(TypeInference, Success, $name, &("success/".to_owned() + $path)); }; } // macro_rules! ti_failure { // ($name:ident, $path:expr) => { - // make_spec_test!(TypeInference, Failure, $name, $path); + // make_spec_test!(TypeInference, Failure, $name, &("failure/".to_owned() + $path)); // }; // } diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs index f7802e8..b7a38be 100644 --- a/dhall/src/tests.rs +++ b/dhall/src/tests.rs @@ -86,14 +86,8 @@ pub fn run_test( Typecheck => "typecheck/", TypeInference => "type-inference/", }; - let status_prefix = match status { - Success => "success/", - Failure => "failure/", - }; - let base_path = "../dhall-lang/tests/".to_owned() - + feature_prefix - + status_prefix - + base_path; + let base_path = + "../dhall-lang/tests/".to_owned() + feature_prefix + base_path; match status { Success => { let expr_file_path = base_path.clone() + "A.dhall"; |