From ec4ac2ed302283a51ae1accea175f9faa0cc5187 Mon Sep 17 00:00:00 2001 From: zoltan Date: Tue, 23 Jun 2009 22:30:41 +0000 Subject: [PATCH] 2009-06-24 Zoltan Varga * libtest.c make_imt_test.sh: Applied patch from Romain Tartiere (romain@blogreen.org). Fix tests on freebsd. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@136747 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/tests/ChangeLog | 5 +++++ mono/tests/libtest.c | 2 +- mono/tests/make_imt_test.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog index 9df5ce040..40ff030eb 100644 --- a/mono/tests/ChangeLog +++ b/mono/tests/ChangeLog @@ -1,3 +1,8 @@ +2009-06-24 Zoltan Varga + + * libtest.c make_imt_test.sh: Applied patch from Romain Tartiere + (romain@blogreen.org). Fix tests on freebsd. + 2009-06-17 Zoltan Varga * runtime-invoke.cs: Add test for sharing i8/u8 return values. diff --git a/mono/tests/libtest.c b/mono/tests/libtest.c index 08a7c6ce3..ba0c35254 100644 --- a/mono/tests/libtest.c +++ b/mono/tests/libtest.c @@ -3000,7 +3000,7 @@ mono_test_marshal_ccw_itest (MonoComObject *pUnk) * mono_method_get_unmanaged_thunk tests */ -#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__))) || (defined(__ppc__) && defined(__APPLE__))) +#if defined(__GNUC__) && ((defined(__i386__) && (defined(__linux__) || defined (__APPLE__)) || defined (__FreeBSD__)) || (defined(__ppc__) && defined(__APPLE__))) #define ALIGN(size) __attribute__ ((aligned(size))) #else #define ALIGN(size) diff --git a/mono/tests/make_imt_test.sh b/mono/tests/make_imt_test.sh index a828e10aa..3cc1c8721 100755 --- a/mono/tests/make_imt_test.sh +++ b/mono/tests/make_imt_test.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/usr/bin/env bash LOW=2000 HIGH=2000 -- 2.11.4.GIT