From c33e7c2b1a62f340432c752fb37ca1374e3e982a Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 7 Jan 2016 06:23:14 -0800 Subject: Fix +RTS -h when compiling without -prof Summary: Was broken by ce1f1607ed7f8fedd2f63c8610cafefd59baaf32. I've added a test so that hopefully it won't break again. Test Plan: validate & new test case Reviewers: bgamari, austin, erikd Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1746 GHC Trac Issues: #11304 --- testsuite/tests/profiling/should_run/all.T | 11 +++++++++-- testsuite/tests/profiling/should_run/heapprof002.stdout | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 testsuite/tests/profiling/should_run/heapprof002.stdout (limited to 'testsuite/tests/profiling/should_run') diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T index 4e4bd09698..840b25104d 100644 --- a/testsuite/tests/profiling/should_run/all.T +++ b/testsuite/tests/profiling/should_run/all.T @@ -4,11 +4,18 @@ extra_prof_ways = ['prof', 'prof_hc_hb', 'prof_hb', 'prof_hd', 'prof_hy', 'prof_ test('heapprof001', [only_ways(prof_ways), - extra_ways(extra_prof_ways), - req_profiling, + when(have_profiling(), extra_ways(extra_prof_ways)), extra_run_opts('7')], compile_and_run, ['']) +test('heapprof002', + [ pre_cmd('cp heapprof001.hs heapprof002.hs') + , extra_clean(['heapprof002.hs']) + , extra_ways(['prof_h']) + , extra_run_opts('7') + ], + compile_and_run, ['']) + test('T2592', [only_ways(['profasm']), req_profiling, extra_run_opts('+RTS -M1m -RTS'), exit_code(251)], diff --git a/testsuite/tests/profiling/should_run/heapprof002.stdout b/testsuite/tests/profiling/should_run/heapprof002.stdout new file mode 100644 index 0000000000..e62352412e --- /dev/null +++ b/testsuite/tests/profiling/should_run/heapprof002.stdout @@ -0,0 +1,7 @@ +a <= +a <= +a <= +a <= +a <= +a <= +a <= -- cgit v1.2.1