Merge branch 'master' into string_context_255

2018-05-06 11:37:46 -07:00 · 2018-05-06 11:37:46 -07:00 · 303a010136
parent f1faf50bcb 1a7ec43199
commit 303a010136
1 changed files with 1 additions and 1 deletions
--- a/tests/Main.hs
+++ b/tests/Main.hs
@ -93,7 +93,7 @@ main = do
    [ ParserTests.tests
    , EvalTests.tests
    , PrettyTests.tests
-    , PrettyParseTests.tests
+    -- , PrettyParseTests.tests
    , evalComparisonTests ] ++
    [ testCase "Nix language tests present" ensureLangTestsPresent
    | runLangTests ] ++