[PATCH] Fix T5435_dyn_asm on mingw and T8832 on 32-bit architecture

Simon Marlow marlowsd at gmail.com
Wed Jun 4 07:20:54 UTC 2014


Rather than marking T8832 as broken, we should just have the 32-bit 
output.  I believe you can put it in the file T8832.stdout-ws-32.

On 03/06/2014 07:06, transfuturist wrote:
> ---
>   testsuite/tests/rts/all.T                      | 3 +++
>   testsuite/tests/simplCore/should_compile/all.T | 3 ++-
>   2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
> index a56a3f3..c52cea0 100644
> --- a/testsuite/tests/rts/all.T
> +++ b/testsuite/tests/rts/all.T
> @@ -141,6 +141,9 @@ def checkDynAsm(actual_file, normaliser):
>       elif actual == ['ctors1', 'ctors2', 'initArray1', 'initArray2', 'success']:
>           if_verbose(1, 'T5435_dyn_asm detected old-style dlopen, see #8458')
>           return 1
> +    elif opsys('mingw32'):
> +        if actual == ['ctors1', 'ctors2', 'success']:
> +            return 1
>       else:
>           if_verbose(1, 'T5435_dyn_asm failed with %s, see all.T for details' % actual)
>           return 0
> diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
> index 616b6cc..ffc7131 100644
> --- a/testsuite/tests/simplCore/should_compile/all.T
> +++ b/testsuite/tests/simplCore/should_compile/all.T
> @@ -198,7 +198,8 @@ test('T5996',
>        ['$MAKE -s --no-print-directory T5996'])
>   test('T8537', normal, compile, [''])
>   test('T8832',
> -     extra_clean(['T8832.hi', 'T8832a.o']),
> +     [extra_clean(['T8832.hi', 'T8832a.o']),
> +      when(wordsize(32),expect_broken(8832))],
>        run_command,
>        ['$MAKE -s --no-print-directory T8832'])
>   test('T8848', only_ways(['optasm']), compile, ['-ddump-rule-firings'])
>


More information about the ghc-devs mailing list