[commit: ghc] master: testsuite/joao-circular: Clean up test results (da5e693)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/da5e693275f41d34872aba31cdf320711422ed9c/ghc

>---------------------------------------------------------------

commit da5e693275f41d34872aba31cdf320711422ed9c
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Dec 27 01:14:00 2015 +0100

    testsuite/joao-circular: Clean up test results
    
    Eliminate redundant pattern which resulted in warning. Also increase the
    compile timeout multiplier since this test tends to take quite a while
    to build. I have seen it fail numerous times during Harbormaster builds
    and have never seen it pass on ARM.
    
    Test Plan: Validate
    
    Reviewers: austin, thomie
    
    Reviewed By: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1699


>---------------------------------------------------------------

da5e693275f41d34872aba31cdf320711422ed9c
 testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs | 1 -
 testsuite/tests/programs/joao-circular/test.T               | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs b/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
index ec47769..d542e4f 100644
--- a/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
+++ b/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
@@ -1280,7 +1280,6 @@ happyNewToken action sts stk (tk:tks) =
 	TIdent happy_dollar_dollar -> cont 51;
 	TintVal happy_dollar_dollar -> cont 52;
 	TrealVal happy_dollar_dollar -> cont 53;
-	_ -> happyError tks
 	}
 
 happyThen = \m k -> k m
diff --git a/testsuite/tests/programs/joao-circular/test.T b/testsuite/tests/programs/joao-circular/test.T
index 3fbf054..589add0 100644
--- a/testsuite/tests/programs/joao-circular/test.T
+++ b/testsuite/tests/programs/joao-circular/test.T
@@ -7,6 +7,9 @@ test('joao-circular',
                    'LrcPrelude.hi',        'LrcPrelude.o',
                    'Main.hi',              'Main.o',
                    'Visfun_Lazy.hi',       'Visfun_Lazy.o']),
+      # This can take a while to compile, especially with
+      # LLVM backend (as is necessary on, e.g., ARM)
+      compile_timeout_multiplier(3.0),
       extra_run_opts('inp 40')],
      multimod_compile_and_run,
      ['Main', '-O'])