[Git][ghc/ghc][wip/slowtest] 22 commits: testsuite: Mark T14761c as broken in hpc, profasm, and optasm ways
Ben Gamari
gitlab at gitlab.haskell.org
Tue Jun 11 20:08:51 UTC 2019
Ben Gamari pushed to branch wip/slowtest at Glasgow Haskell Compiler / GHC
Commits:
9bf20fa7 by Ben Gamari at 2019-06-11T19:53:37Z
testsuite: Mark T14761c as broken in hpc, profasm, and optasm ways
As noted in #16540.
- - - - -
00a1c98e by Ben Gamari at 2019-06-11T19:53:48Z
testsuite: Mark T16180 as broken in ghci and ext-interp ways
As noted in #16541.
- - - - -
2a4178ef by Ben Gamari at 2019-06-11T19:53:48Z
testsuite: Omit tcrun022 in hpc way
As noted in #16542, the expected rule doesn't fire. However, this
doesn't seem terribly surpring given the circumstances.
- - - - -
a4a8b82a by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Mark Overflow as broken in hpc way
As noted in #16543.
- - - - -
67026576 by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Mark T2783 as fragile in threaded1
It was previously marked as broken but it passes non-deterministically.
See #2783.
- - - - -
43707434 by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Skip T7919 in ghci way
It times out pretty reliably. It's not clear that much is gained by
running this test in the ghci way anyways.
- - - - -
6137c44e by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Fix fragile_for test modifier
- - - - -
0be20257 by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Fix omit_ways usage
omit_ways expects a list but this was broken in several cases.
- - - - -
42be8f18 by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Mark threadstatus-T9333 as fragile in ghci way
As noted in #16555.
- - - - -
ca0f71e8 by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Omit profasm way for cc017
cc017 requires TH but we can't load dynamic profiled objects.
- - - - -
cca4a9cb by Ben Gamari at 2019-06-11T19:53:49Z
testsuite: Skip T493 in ghci way.
T493 tests #493, which is an FFI test. FFI tests should be skipped
in ghci way.
- - - - -
63425da6 by Ben Gamari at 2019-06-11T19:53:50Z
testsuite: Mark T16449_2 as broken due to #16742
- - - - -
d3eae47a by Ben Gamari at 2019-06-11T19:53:50Z
testsuite: Mark T16737 as broken in ghci way due to #16541
- - - - -
ebc445cd by Ben Gamari at 2019-06-11T19:53:50Z
testsuite: Note intentional typo in T7130
I earlier accidentally corrected it breaking the test.
- - - - -
e32b348c by Ben Gamari at 2019-06-11T19:53:50Z
linters/check-makefiles: Limit lint to Makefiles
Previously we would apply this rule, which is only intended for
testsuite Makefiles, to all files. This lead to a number of
false-positives in all.T files.
- - - - -
b509df62 by Ben Gamari at 2019-06-11T19:53:50Z
gitlab-ci: Fetch submodules before running submodule linter
- - - - -
dd7af1de by Ben Gamari at 2019-06-11T19:53:50Z
Fix uses of #ifdef/#ifndef
The linter now enforces our preference for `#if defined()` and
`#if !defined()`.
- - - - -
ec8a7d03 by Ben Gamari at 2019-06-11T19:53:50Z
Bump unix submodule
Marks posix002 as fragile in threaded2 way due to #16550.
- - - - -
4ba68bff by Ben Gamari at 2019-06-11T19:53:50Z
process: Bump submodule
* Skip process005 in ghci way
* Mark process002 as fragile in threaded2
- - - - -
79ef5215 by Ben Gamari at 2019-06-11T19:53:50Z
testsuite: Skip cgrun078 in ghci way
This test requires FFI usage.
- - - - -
a3152287 by Ben Gamari at 2019-06-11T19:53:51Z
testsuite: Unbreak galois_raytrace on i386
galois_raytrace was previously broken on i386 due to use of x87
arithmethic on that platform. However,
42504f4a575395a35eec5c3fd7c9ef6e2b54e68e removes x87 support; this
resulted in an unexpected pass. Unmark this test as broken.
- - - - -
edda3103 by Ben Gamari at 2019-06-11T20:08:11Z
testsuite: Don't run tests requiring TH in profasm way when GhcDynamic
Since we can't load profiled objects when GhcDynamic==YES. Affects:
* T16737
* T16384
* T16718
* T16619
* T16190
- - - - -
27 changed files:
- .gitlab-ci.yml
- .gitlab/linters/check-makefiles.py
- .gitlab/linters/linter.py
- aclocal.m4
- hadrian/src/Rules/Generate.hs
- includes/ghc.mk
- libraries/process
- libraries/unix
- testsuite/driver/testlib.py
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/concurrent/should_run/all.T
- testsuite/tests/driver/all.T
- testsuite/tests/ffi/should_compile/all.T
- testsuite/tests/ffi/should_run/all.T
- testsuite/tests/lib/integer/all.T
- testsuite/tests/parser/should_compile/all.T
- testsuite/tests/perf/compiler/all.T
- testsuite/tests/programs/barton-mangler-bug/test.T
- testsuite/tests/programs/galois_raytrace/test.T
- testsuite/tests/quotes/all.T
- testsuite/tests/roles/should_compile/all.T
- testsuite/tests/rts/all.T
- testsuite/tests/th/all.T
- testsuite/tests/typecheck/should_compile/all.T
- testsuite/tests/typecheck/should_run/all.T
- testsuite/tests/utils/should_run/all.T
- testsuite/tests/warnings/should_compile/all.T
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -80,6 +80,7 @@ ghc-linters:
- git fetch "$CI_MERGE_REQUEST_PROJECT_URL" $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
- base="$(git merge-base FETCH_HEAD $CI_COMMIT_SHA)"
- "echo Linting submodule changes between $base..$CI_COMMIT_SHA"
+ - git submodule foreach git remote update
- submodchecker .git $(git rev-list $base..$CI_COMMIT_SHA)
dependencies: []
tags:
@@ -109,6 +110,7 @@ lint-submods-branch:
extends: .lint-submods
script:
- "echo Linting submodule changes between $CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA"
+ - git submodule foreach git remote update
- submodchecker .git $(git rev-list $CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA)
only:
refs:
=====================================
.gitlab/linters/check-makefiles.py
=====================================
@@ -12,7 +12,8 @@ from linter import run_linters, RegexpLinter
linters = [
RegexpLinter(r'--interactive',
- message = "Warning: Use `$(TEST_HC_OPTS_INTERACTIVE)` instead of `--interactive -ignore-dot-ghci -v0`.")
+ message = "Warning: Use `$(TEST_HC_OPTS_INTERACTIVE)` instead of `--interactive -ignore-dot-ghci -v0`.",
+ path_filter = lambda path: path == 'Makefile')
]
if __name__ == '__main__':
=====================================
.gitlab/linters/linter.py
=====================================
@@ -73,13 +73,14 @@ class RegexpLinter(LineLinter):
A :class:`RegexpLinter` produces the given warning message for
all lines matching the given regular expression.
"""
- def __init__(self, regex, message):
+ def __init__(self, regex, message, path_filter=lambda path: True):
LineLinter.__init__(self)
self.re = re.compile(regex)
self.message = message
+ self.path_filter = path_filter
def lint_line(self, path, line_no, line):
- if self.re.search(line):
+ if self.path_filter(path) and self.re.search(line):
w = Warning(path=path, line_no=line_no, line_content=line[:-1],
message=self.message)
self.add_warning(w)
=====================================
aclocal.m4
=====================================
@@ -866,7 +866,7 @@ case $TargetPlatform in
esac ;;
i386-unknown-mingw32) fptools_cv_leading_underscore=yes;;
x86_64-unknown-mingw32) fptools_cv_leading_underscore=no;;
- *) AC_RUN_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NLIST_H
+ *) AC_RUN_IFELSE([AC_LANG_SOURCE([[#if defined(HAVE_NLIST_H)
#include <nlist.h>
struct nlist xYzzY1[] = {{"xYzzY1", 0},{0}};
struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}};
@@ -876,7 +876,7 @@ int main(argc, argv)
int argc;
char **argv;
{
-#ifdef HAVE_NLIST_H
+#if defined(HAVE_NLIST_H)
if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0)
exit(1);
if(nlist(argv[0], xYzzY2) == 0 && xYzzY2[0].n_value != 0)
@@ -1650,16 +1650,16 @@ then
[fptools_cv_timer_create_works],
[AC_TRY_RUN([
#include <stdio.h>
-#ifdef HAVE_STDLIB_H
+#if defined(HAVE_STDLIB_H)
#include <stdlib.h>
#endif
-#ifdef HAVE_TIME_H
+#if defined(HAVE_TIME_H)
#include <time.h>
#endif
-#ifdef HAVE_SIGNAL_H
+#if defined(HAVE_SIGNAL_H)
#include <signal.h>
#endif
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#endif
=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -233,7 +233,7 @@ generateGhcPlatformH = do
targetVendor <- getSetting TargetVendor
ghcUnreg <- getFlag GhcUnregisterised
return . unlines $
- [ "#ifndef __GHCPLATFORM_H__"
+ [ "#if !defined(__GHCPLATFORM_H__)"
, "#define __GHCPLATFORM_H__"
, ""
, "#define BuildPlatform_TYPE " ++ cppify hostPlatform
@@ -386,7 +386,7 @@ generateGhcAutoconfH = do
ccLlvmBackend <- getSetting CcLlvmBackend
ccClangBackend <- getSetting CcClangBackend
return . unlines $
- [ "#ifndef __GHCAUTOCONF_H__"
+ [ "#if !defined(__GHCAUTOCONF_H__)"
, "#define __GHCAUTOCONF_H__" ]
++ configHContents ++
[ "\n#define TABLES_NEXT_TO_CODE 1" | tablesNextToCode && not ghcUnreg ]
@@ -422,7 +422,7 @@ generateGhcBootPlatformH = do
targetOs <- getSetting TargetOs
targetVendor <- getSetting TargetVendor
return $ unlines
- [ "#ifndef __PLATFORM_H__"
+ [ "#if !defined(__PLATFORM_H__)"
, "#define __PLATFORM_H__"
, ""
, "#define BuildPlatform_NAME " ++ show buildPlatform
@@ -464,10 +464,10 @@ generateGhcVersionH = do
patchLevel1 <- getSetting ProjectPatchLevel1
patchLevel2 <- getSetting ProjectPatchLevel2
return . unlines $
- [ "#ifndef __GHCVERSION_H__"
+ [ "#if !defined(__GHCVERSION_H__)"
, "#define __GHCVERSION_H__"
, ""
- , "#ifndef __GLASGOW_HASKELL__"
+ , "#if !defined(__GLASGOW_HASKELL__)"
, "# define __GLASGOW_HASKELL__ " ++ version
, "#endif"
, ""]
=====================================
includes/ghc.mk
=====================================
@@ -57,7 +57,7 @@ endif
$(includes_H_VERSION) : mk/project.mk | $$(dir $$@)/.
@echo "Creating $@..."
- @echo "#ifndef __GHCVERSION_H__" > $@
+ @echo "#if !defined(__GHCVERSION_H__)" > $@
@echo "#define __GHCVERSION_H__" >> $@
@echo >> $@
@echo "#define __GLASGOW_HASKELL__ $(ProjectVersionInt)" >> $@
@@ -92,7 +92,7 @@ else
$(includes_H_CONFIG) : mk/config.h mk/config.mk includes/ghc.mk | $$(dir $$@)/.
@echo "Creating $@..."
- @echo "#ifndef __GHCAUTOCONF_H__" >$@
+ @echo "#if !defined(__GHCAUTOCONF_H__)" >$@
@echo "#define __GHCAUTOCONF_H__" >>$@
#
# Copy the contents of mk/config.h, turning '#define PACKAGE_FOO
@@ -125,7 +125,7 @@ endif
$(includes_H_PLATFORM) : includes/Makefile | $$(dir $$@)/.
$(call removeFiles,$@)
@echo "Creating $@..."
- @echo "#ifndef __GHCPLATFORM_H__" >$@
+ @echo "#if !defined(__GHCPLATFORM_H__)" >$@
@echo "#define __GHCPLATFORM_H__" >>$@
@echo >> $@
@echo "#define BuildPlatform_TYPE $(HostPlatform_CPP)" >> $@
=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit d860209e53c1b40b7c251fc8378886bbcb394402
+Subproject commit 5c81524694ceaf8523a1846718a7a7c3f402124f
=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit a102df29c107e8f853129dd40fbbb487e1818149
+Subproject commit 3985f63a35235ce5e10a4cb6f532c1041f466372
=====================================
testsuite/driver/testlib.py
=====================================
@@ -257,14 +257,14 @@ def fragile( bug ):
return helper
-def fragile_for( name, opts, bug, ways ):
+def fragile_for( bug, ways ):
"""
Indicates that the test should be skipped due to fragility in the given
test ways as documented in the given ticket.
"""
def helper( name, opts, bug=bug, ways=ways ):
record_broken(name, opts, bug)
- opts.omit_ways = ways
+ opts.omit_ways += ways
return helper
@@ -274,7 +274,8 @@ def omit_ways( ways ):
return lambda name, opts, w=ways: _omit_ways( name, opts, w )
def _omit_ways( name, opts, ways ):
- opts.omit_ways = ways
+ assert ways.__class__ is list
+ opts.omit_ways += ways
# -----
@@ -433,6 +434,14 @@ def unless(b, f):
def doing_ghci():
return 'ghci' in config.run_ways
+def requires_th(name, opts):
+ """
+ Mark a test as requiring TemplateHaskell. Currently this means
+ that we don't run the test in the profasm when when GHC is
+ dynamically-linked since we can't load profiled objects in this case.
+ """
+ return when(ghc_dynamic(), omit_ways(['profasm']))
+
def ghc_dynamic():
return config.ghc_dynamic
=====================================
testsuite/tests/codeGen/should_run/all.T
=====================================
@@ -83,7 +83,7 @@ test('cgrun072', normal, compile_and_run, [''])
test('cgrun075', normal, compile_and_run, [''])
test('cgrun076', normal, compile_and_run, [''])
test('cgrun077', [when(have_cpu_feature('bmi2'), extra_hc_opts('-mbmi2'))], compile_and_run, [''])
-test('cgrun078', normal, compile_and_run, [''])
+test('cgrun078', omit_ways(['ghci']), compile_and_run, [''])
test('T1852', normal, compile_and_run, [''])
test('T1861', extra_run_opts('0'), compile_and_run, [''])
@@ -196,4 +196,4 @@ test('T15892',
extra_run_opts('+RTS -G1 -A32k -RTS') ],
compile_and_run, ['-O'])
test('T16617', normal, compile_and_run, [''])
-test('T16449_2', exit_code(1), compile_and_run, [''])
+test('T16449_2', [expect_broken_for(16742, ['dyn', 'ghci', 'optasm', 'threaded2']), exit_code(1)], compile_and_run, [''])
=====================================
testsuite/tests/concurrent/should_run/all.T
=====================================
@@ -88,7 +88,7 @@ test('T7970', normal, compile_and_run, [''])
test('AtomicPrimops', normal, compile_and_run, [''])
# test uses 2 threads and yield, scheduling can vary with threaded2
-test('threadstatus-9333', [omit_ways(['threaded2'])], compile_and_run, [''])
+test('threadstatus-9333', [fragile_for(16555, ['ghci']), omit_ways(['threaded2'])], compile_and_run, [''])
test('T9379', normal, compile_and_run, [''])
@@ -239,7 +239,7 @@ test('conc067', ignore_stdout, compile_and_run, [''])
# omit threaded2, the behaviour of this test is non-deterministic with more
# than one CPU.
-test('conc068', [ omit_ways('threaded2'), exit_code(1) ], compile_and_run, [''])
+test('conc068', [ omit_ways(['threaded2']), exit_code(1) ], compile_and_run, [''])
test('setnumcapabilities001',
[ only_ways(['threaded1','threaded2']),
=====================================
testsuite/tests/driver/all.T
=====================================
@@ -170,6 +170,7 @@ test( 'T4114d', [fobject_code, expect_broken_for(4114, ['ghci'])], compile_and_r
test('T5584', [], makefile_test, [])
test('T5198', [], makefile_test, [])
test('T7060', [], makefile_test, [])
+# N.B. The typo in the argument below is intentional.
test('T7130', normal, compile_fail, ['-fflul-laziness'])
test('T7563', when(unregisterised(), skip), makefile_test, [])
test('T6037',
@@ -270,4 +271,8 @@ test('inline-check', omit_ways(['hpc', 'profasm'])
test('T14452', [], makefile_test, [])
test('T15396', normal, compile_and_run, ['-package ghc'])
-test('T16737', [extra_files(['T16737include/'])], compile_and_run, ['-optP=-isystem -optP=T16737include'])
+test('T16737',
+ [extra_files(['T16737include/']),
+ requires_th,
+ expect_broken_for(16541, ['ghci'])],
+ compile_and_run, ['-optP=-isystem -optP=T16737include'])
=====================================
testsuite/tests/ffi/should_compile/all.T
=====================================
@@ -35,7 +35,8 @@ test('T11983', [omit_ways(['ghci'])], compile, ['T11983.c'])
test('T14125', normal, compile, [''])
test(
'cc017',
- normal,
+ # We need TH but can't load profiled dynamic objects
+ when(ghc_dynamic(), omit_ways(['profasm'])),
compile,
[
'-optc=-DC -optcxx=-DCXX -optcxx=-std=c++11'
=====================================
testsuite/tests/ffi/should_run/all.T
=====================================
@@ -207,4 +207,4 @@ test('PrimFFIInt16', [omit_ways(['ghci'])], compile_and_run, ['PrimFFIInt16_c.c'
test('PrimFFIWord16', [omit_ways(['ghci'])], compile_and_run, ['PrimFFIWord16_c.c'])
-test('T493', [], compile_and_run, ['T493_c.c'])
+test('T493', [omit_ways(['ghci'])], compile_and_run, ['T493_c.c'])
=====================================
testsuite/tests/lib/integer/all.T
=====================================
@@ -1,8 +1,8 @@
test('integerBits', normal, compile_and_run, [''])
test('integerConversions', normal, compile_and_run, [''])
# skip ghci as it doesn't support unboxed tuples
-test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways('ghci')], compile_and_run, [''])
-test('plusMinusInteger', [omit_ways('ghci')], compile_and_run, [''])
+test('integerGmpInternals', [reqlib('integer-gmp'), omit_ways(['ghci'])], compile_and_run, [''])
+test('plusMinusInteger', [omit_ways(['ghci'])], compile_and_run, [''])
test('integerConstantFolding', normal, makefile_test, ['integerConstantFolding'])
test('fromToInteger', [], makefile_test, ['fromToInteger'])
test('IntegerConversionRules', [], makefile_test, ['IntegerConversionRules'])
=====================================
testsuite/tests/parser/should_compile/all.T
=====================================
@@ -142,5 +142,5 @@ test('T15457', normal, compile, [''])
test('T15675', normal, compile, [''])
test('T15781', normal, compile, [''])
test('T16339', normal, compile, [''])
-test('T16619', [], multimod_compile, ['T16619', '-v0'])
+test('T16619', requires_th, multimod_compile, ['T16619', '-v0'])
test('T504', normal, compile, [''])
=====================================
testsuite/tests/perf/compiler/all.T
=====================================
@@ -404,7 +404,7 @@ test ('WWRec',
['-v0 -O'])
test('T16190',
- collect_stats(),
+ [requires_th, collect_stats()],
multimod_compile,
['T16190.hs', '-v0'])
=====================================
testsuite/tests/programs/barton-mangler-bug/test.T
=====================================
@@ -8,7 +8,7 @@ test('barton-mangler-bug',
'Plot.hi', 'Plot.o',
'PlotExample.hi', 'PlotExample.o',
'TypesettingTricks.hi', 'TypesettingTricks.o']),
- omit_ways('debug') # Fails for debug way due to annotation linting timeout
+ omit_ways(['debug']) # Fails for debug way due to annotation linting timeout
],
multimod_compile_and_run, ['Main', ''])
=====================================
testsuite/tests/programs/galois_raytrace/test.T
=====================================
@@ -1,8 +1,3 @@
-# Floating point differences on x86 using the NCG
-if config.platform.startswith('i386-') and \
- config.platform != 'i386-unknown-openbsd':
- setTestOpts(expect_fail_for(['hpc','optasm','profasm','threaded2','profthreaded']))
-
test('galois_raytrace', [extra_files(['CSG.hs', 'Construct.hs', 'Data.hs', 'Eval.hs', 'Geometry.hs', 'Illumination.hs', 'Intersections.hs', 'Interval.hs', 'Main.hs', 'Misc.hs', 'Parse.hs', 'Primitives.hs', 'Surface.hs', 'galois.gml']),
when(fast(), skip)],
multimod_compile_and_run, ['Main', '-package parsec'])
=====================================
testsuite/tests/quotes/all.T
=====================================
@@ -15,7 +15,7 @@ test('T8633', normal, compile_and_run, [''])
test('T8759a', normal, compile, ['-v0'])
test('T9824', normal, compile, ['-v0'])
test('T10384', normal, compile_fail, [''])
-test('T16384', normal, compile, [''])
+test('T16384', requires_th, compile, [''])
test('TH_tf2', normal, compile, ['-v0'])
test('TH_ppr1', normal, compile_and_run, [''])
=====================================
testsuite/tests/roles/should_compile/all.T
=====================================
@@ -10,4 +10,4 @@ test('T8958', [normalise_fun(normalise_errmsg), only_ways('normal')], compile, [
test('T10263', normal, compile, [''])
test('T9204b', [], multimod_compile, ['T9204b', '-v0'])
test('T14101', normal, compile, [''])
-test('T16718', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
+test('T16718', requires_th, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
=====================================
testsuite/tests/rts/all.T
=====================================
@@ -73,7 +73,7 @@ test('T2047', [ignore_stdout, extra_run_opts('+RTS -c -RTS')],
# Blackhole-detection test.
# Skip GHCi due to #2786
test('T2783', [ omit_ways(['ghci']), exit_code(1)
- , expect_broken_for(2783, ['threaded1'])
+ , fragile_for(2783, ['threaded1'])
], compile_and_run, [''])
# Test the work-stealing deque implementation. We run this test in
@@ -93,7 +93,7 @@ test('stack002', [extra_files(['stack001.hs']),
# run this test with very small stack chunks to exercise the stack
# overflow/underflow machinery.
-test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
+test('stack003', [ omit_ways(['ghci']), # uses unboxed tuples
extra_run_opts('500000 +RTS -kc1k -kb100 -K96m -RTS') ],
compile_and_run, [''])
@@ -214,7 +214,8 @@ test('T7815', [ multi_cpu_race,
test('ffishutdown', [ignore_stderr, only_ways(['threaded1','threaded2'])],
compile_and_run, [''])
-test('T7919', [when(fast(), skip), omit_ways(prof_ways)], compile_and_run,
+# Times out in ghci way
+test('T7919', [when(fast(), skip), omit_ways(['ghci'] + prof_ways)], compile_and_run,
[config.ghc_th_way_flags])
test('T8035', normal, compile_and_run, [''])
=====================================
testsuite/tests/th/all.T
=====================================
@@ -13,7 +13,7 @@ if config.have_ext_interp :
setTestOpts(extra_ways(['ext-interp']))
setTestOpts(only_ways(['normal','ghci','ext-interp']))
-broken_tests = ["ClosedFam1TH","T10620","T10828","T11721_TH","T11797","T12045TH2","T12478_1","T12646","T13642","T14060","T15502","T15738","T15792","T15845","T1835","T3920","T4135","T4188","T5037","T5362","T7477","T7910","T8761","T8884","T8953","T9262","T9692","T9738","TH_Lift","TH_RichKinds","TH_RichKinds2","TH_Roles3","TH_TyInstWhere2","TH_implicitParams","TH_recursiveDo","TH_reifyDecl1","TH_reifyExplicitForAllFams","TH_reifyInstances","TH_reifyMkName","TH_repE2","TH_repGuard","TH_repPrim","TH_repPrim2","TH_repUnboxedTuples","TH_spliceE6","T16326_TH"]
+broken_tests = ["ClosedFam1TH","T10620","T10828","T11721_TH","T11797","T12045TH2","T12478_1","T12646","T13642","T14060","T15502","T15738","T15792","T15845","T16180","T1835","T3920","T4135","T4188","T5037","T5362","T7477","T7910","T8761","T8884","T8953","T9262","T9692","T9738","TH_Lift","TH_RichKinds","TH_RichKinds2","TH_Roles3","TH_TyInstWhere2","TH_implicitParams","TH_recursiveDo","TH_reifyDecl1","TH_reifyExplicitForAllFams","TH_reifyInstances","TH_reifyMkName","TH_repE2","TH_repGuard","TH_repPrim","TH_repPrim2","TH_repUnboxedTuples","TH_spliceE6","T16326_TH"]
# ext-interp, integer-gmp and llvm is broken see #16087
def broken_ext_interp(name, opts):
if name in broken_tests and config.ghc_built_by_llvm:
@@ -467,7 +467,10 @@ test('T15437', expect_broken(15437), multimod_compile,
test('T15985', normal, compile, [''])
test('T16133', normal, compile_fail, [''])
test('T15471', normal, multimod_compile, ['T15471.hs', '-v0'])
-test('T16180', normal, compile_and_run, [''])
+test('T16180',
+ [when(llvm_build(), expect_broken_for(16541, ['ext-interp'])),
+ expect_broken_for(16541, ['ghci'])],
+ compile_and_run, ['-package ghc'])
test('T16183', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
test('T16195', normal, multimod_compile, ['T16195.hs', '-v0'])
test('T16293b', normal, compile, [''])
=====================================
testsuite/tests/typecheck/should_compile/all.T
=====================================
@@ -659,7 +659,7 @@ test('T15586', normal, compile, [''])
test('T15368', normal, compile, ['-fdefer-type-errors'])
test('T15645', normal, compile, ['-Wwarn=missing-monadfail-instances'])
test('T15778', normal, compile, [''])
-test('T14761c', normal, compile, [''])
+test('T14761c', expect_broken_for(16540, ['hpc', 'profasm', 'optasm']), compile, [''])
test('T16008', normal, compile, [''])
test('T16033', normal, compile, [''])
test('T16141', normal, compile, ['-O'])
=====================================
testsuite/tests/typecheck/should_run/all.T
=====================================
@@ -35,7 +35,7 @@ test('tcrun018', normal, compile_and_run, [''])
test('tcrun019', normal, compile_and_run, [''])
test('tcrun020', normal, compile_and_run, [''])
test('tcrun021', normal, compile_and_run, ['-package containers'])
-test('tcrun022', omit_ways(['ghci']), compile_and_run, ['-O'])
+test('tcrun022', omit_ways(['hpc', 'ghci']), compile_and_run, ['-O'])
test('tcrun023', [when(doing_ghci(), extra_hc_opts('-fobject-code'))],
compile_and_run, ['-O'])
test('tcrun024', normal, compile_and_run, ['-O'])
@@ -96,7 +96,7 @@ test('T6117', normal, compile_and_run, [''])
test('T5751', normal, compile_and_run, [''])
test('T5913', normal, compile_and_run, [''])
test('T7748', normal, compile_and_run, [''])
-test('T7861', [omit_ways('debug'), exit_code(1)], compile_and_run, [''])
+test('T7861', [omit_ways(['debug']), exit_code(1)], compile_and_run, [''])
test('TcTypeNatSimpleRun', normal, compile_and_run, [''])
test('TcTypeSymbolSimpleRun', normal, compile_and_run, [''])
test('T8119', normal, ghci_script, ['T8119.script'])
=====================================
testsuite/tests/utils/should_run/all.T
=====================================
@@ -1,6 +1,6 @@
test('T14854',
[only_ways(threaded_ways),
- omit_ways('ghci'),
+ omit_ways(['ghci']),
reqlib('random'),
ignore_stderr],
compile_and_run,
=====================================
testsuite/tests/warnings/should_compile/all.T
=====================================
@@ -26,4 +26,4 @@ test('T16551', [extra_files(['T16551/'])], multimod_compile, ['T16551/A.hs T1655
test('StarBinder', normal, compile, [''])
-test('Overflow', normal, compile, [''])
+test('Overflow', expect_broken_for(16543, ['hpc']), compile, [''])
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4325cce5b7c06788a8ddf30793c0fb0aa8c8fb1b...edda3103b6a6284aff12f041c640313c2222cc13
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4325cce5b7c06788a8ddf30793c0fb0aa8c8fb1b...edda3103b6a6284aff12f041c640313c2222cc13
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190611/6e79ee68/attachment-0001.html>
More information about the ghc-commits
mailing list