summaryrefslogtreecommitdiff
path: root/testsuite/tests/programs
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2015-12-27 01:14:00 +0100
committerBen Gamari <ben@smart-cactus.org>2015-12-27 01:43:09 +0100
commitda5e693275f41d34872aba31cdf320711422ed9c (patch)
treee2b7ce1cdbd485325c7f7605d877c2868883accc /testsuite/tests/programs
parent909bbdb59700b7d5c8aa6a3f9b4797003d9e62bd (diff)
downloadhaskell-da5e693275f41d34872aba31cdf320711422ed9c.tar.gz
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
Diffstat (limited to 'testsuite/tests/programs')
-rw-r--r--testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs1
-rw-r--r--testsuite/tests/programs/joao-circular/test.T3
2 files changed, 3 insertions, 1 deletions
diff --git a/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs b/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
index ec47769beb..d542e4f3b1 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 3fbf054790..589add0b57 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'])