Adjust test setup to acceptance test suite changes (#1367)

… from https://github.com/dhall-lang/dhall-lang/pull/758
and https://github.com/dhall-lang/dhall-lang/pull/763.

dhall/dhall-lang

@@ -1 +1 @@
-Subproject commit 76494a43c48e6a5c3db6510918d138c27d055835
+Subproject commit ef644a00e77a3c2c6c503e18e65865fd6d74fc2a

dhall/dhall.cabal

@@ -295,7 +295,6 @@ Extra-Source-Files:
     dhall-lang/tests/semantic-hash/success/simple/*.hash
     dhall-lang/tests/semantic-hash/success/simplifications/*.dhall
     dhall-lang/tests/semantic-hash/success/simplifications/*.hash
-    dhall-lang/tests/type-inference/data/*.dhall
     dhall-lang/tests/type-inference/failure/*.dhall
     dhall-lang/tests/type-inference/success/*.dhall
     dhall-lang/tests/type-inference/success/prelude/Bool/and/*.dhall

dhall/tests/Dhall/Test/Parser.hs

@@ -180,6 +180,7 @@ shouldNotParse path = do
               -- treats a missing type annotation on an empty list as
               -- as a type-checking failure instead of a parse failure,
               -- but this might be fixable.
+            , parseDirectory </> "failure/unit/ListLitEmptyMissingAnnotation.dhall"
             , parseDirectory </> "failure/unit/ListLitEmptyAnnotation.dhall"
 
               -- The same performance improvements also broke the

dhall/tests/Dhall/Test/TypeInference.hs

@@ -85,6 +85,7 @@ failureTest prefix = do
                -- Duplicate fields are incorrectly caught during parsing:
                -- https://github.com/dhall-lang/dhall-haskell/issues/772
                , typeInferenceDirectory </> "failure/unit/RecordLitDuplicateFields"
+               , typeInferenceDirectory </> "failure/unit/RecordProjectionDuplicateFields"
                , typeInferenceDirectory </> "failure/unit/RecordTypeDuplicateFields"
                , typeInferenceDirectory </> "failure/unit/UnionTypeDuplicateVariants1"
                , typeInferenceDirectory </> "failure/unit/UnionTypeDuplicateVariants2"
@@ -99,16 +100,8 @@ failureTest prefix = do
             Left _ -> Tasty.HUnit.assertFailure (prefixFP <> " should have parsed")
             Right e -> return e
 
-        tryResolvedExpr <-
-            Exception.try
-               (Test.Util.loadRelativeTo
-                   (FilePath.takeDirectory prefixFP)
-                   Import.IgnoreSemanticCache
-                   expression)
+        resolved <- Import.assertNoImports expression
 
-        case tryResolvedExpr of
-            Left (SomeException _) -> return ()
-
-            Right resolved -> case TypeCheck.typeOf resolved of
-                Left  _ -> return ()
-                Right _ -> Tasty.HUnit.assertFailure (prefixFP <> " should not have type-checked")
+        case TypeCheck.typeOf resolved of
+            Left  _ -> return ()
+            Right _ -> Tasty.HUnit.assertFailure (prefixFP <> " should not have type-checked")