Peter Trommler pushed to branch wip/T26519 at Glasgow Haskell Compiler / GHC Commits: a30bd70b by Peter Trommler at 2025-12-01T21:35:46+01:00 Revert "Mark tests expect_broken" This reverts commit 28d8869dc0b81e2e126263c640fb66cd0fce4671. - - - - - 2 changed files: - testsuite/tests/profiling/should_run/all.T - testsuite/tests/profiling/should_run/caller-cc/all.T Changes: ===================================== testsuite/tests/profiling/should_run/all.T ===================================== @@ -80,8 +80,7 @@ test('T3001-2', # For profasm/profthreaded, the answer is correct but the ordering of some # lines in the output happen to be different, so we just skip them. test('scc001', - [grep_prof("scc001.hs"), omit_ways(['profasm', 'profthreaded']) - , expect_broken_for(25959, ['prof', 'profdyn'])], + [grep_prof("scc001.hs"), omit_ways(['profasm', 'profthreaded'])], compile_and_run, ['-fno-state-hack -fno-full-laziness']) # Note [consistent stacks] @@ -132,7 +131,7 @@ test('prof-doc-last', [grep_prof("prof-doc-last.hs"), test_opts_dot_prof], compi # unicode in cost centre names test('T5559', [test_opts_dot_prof, fragile(16350), grep_prof("T5559.hs")], compile_and_run, ['']) -test('T7275', [test_opts_dot_prof, expect_broken_for(25959,['prof', 'profdyn'])], makefile_test, []) +test('T7275', test_opts_dot_prof, makefile_test, []) # Note [consistent stacks] # ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -146,14 +145,12 @@ test('T7275', [test_opts_dot_prof, expect_broken_for(25959,['prof', 'profdyn'])] test('callstack001', # unoptimised results are different w.r.t. CAF attribution [test_opts_dot_prof # produces a different stack - , expect_broken_for(25959,['prof', 'profdyn']) - , normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s).replace("//","/")) + ,normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s).replace("//","/")) ], compile_and_run, ['-fprof-auto-calls -fno-full-laziness -fno-state-hack']) test('callstack002', [ test_opts_dot_prof # produces a different stack - , expect_broken_for(25959,['prof', 'profdyn']) , normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s)) ], compile_and_run, @@ -185,12 +182,9 @@ test('T11978a', compile_and_run, ['']) test('toplevel_scc_1', - [grep_prof("toplevel_scc_1.hs"), extra_ways(['prof_no_auto']) - , only_ways(['prof_no_auto']) - , expect_broken_for(25959, 'prof_no_auto') - ] - , compile_and_run - , ['']) + [grep_prof("toplevel_scc_1.hs"), extra_ways(['prof_no_auto']), only_ways(['prof_no_auto'])], + compile_and_run, + ['']) test('T12962', [test_opts_dot_prof, grep_prof("T12962.hs")], compile_and_run, ['']) ===================================== testsuite/tests/profiling/should_run/caller-cc/all.T ===================================== @@ -12,7 +12,7 @@ setTestOpts(grep_prof("calling:")) # N.B. Main.hs is stolen from heapprof001. -test('CallerCc1', expect_broken_for(25959,['prof', 'profasm']), +test('CallerCc1', normal, multimod_compile_and_run, ['Main', '-fprof-callers=*.concat -O0']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a30bd70bf65130aabe9aa2f06871d78f... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a30bd70bf65130aabe9aa2f06871d78f... You're receiving this email because of your account on gitlab.haskell.org.