[Git][ghc/ghc][wip/slowtest] 4 commits: process: Bump submodule

[Ben Gamari]

Ben Gamari pushed to branch wip/slowtest at Glasgow Haskell Compiler / GHC


Commits:
a8579e5b by Ben Gamari at 2019-06-12T12:27:25Z
process: Bump submodule

 * Skip process005 in ghci way
 * Mark process002 as fragile in threaded2

- - - - -
3f1022c5 by Ben Gamari at 2019-06-12T12:27:25Z
testsuite: Skip cgrun078 in ghci way

This test requires FFI usage.

- - - - -
1cbfef47 by Ben Gamari at 2019-06-12T12:27:25Z
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.

- - - - -
20160f1a by Ben Gamari at 2019-06-12T12:27:25Z
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

- - - - -


9 changed files:

- libraries/process
- testsuite/driver/testlib.py
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/driver/all.T
- testsuite/tests/parser/should_compile/all.T
- testsuite/tests/perf/compiler/all.T
- testsuite/tests/programs/galois_raytrace/test.T
- testsuite/tests/quotes/all.T
- testsuite/tests/roles/should_compile/all.T


Changes:

=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit d860209e53c1b40b7c251fc8378886bbcb394402
+Subproject commit 09446a522f5c8ec5a5c32c7494bc1704e107776e


=====================================
testsuite/driver/testlib.py
=====================================
@@ -434,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, [''])


=====================================
testsuite/tests/driver/all.T
=====================================
@@ -272,5 +272,7 @@ test('inline-check', omit_ways(['hpc', 'profasm'])
 test('T14452', [], makefile_test, [])
 test('T15396', normal, compile_and_run, ['-package ghc'])
 test('T16737',
-     [extra_files(['T16737include/']), expect_broken_for(16541, ['ghci'])],
+     [extra_files(['T16737include/']),
+      requires_th,
+      expect_broken_for(16541, ['ghci'])],
      compile_and_run, ['-optP=-isystem -optP=T16737include'])


=====================================
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/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'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/55b78aa5a0b6b613ddedb45024560f785b37889a...20160f1a8a8ed69c168bee5c8d43373191303b3f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/55b78aa5a0b6b613ddedb45024560f785b37889a...20160f1a8a8ed69c168bee5c8d43373191303b3f
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/20190612/ef5755d8/attachment-0001.html>