Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure Linux is running tests #488

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Ensure Linux is running tests #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c46d95f
Ensure Linux is running tests
tannergooding Nov 10, 2023
13d2da3
Resolving various Linux test failures
tannergooding Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/cibuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"

. "$ScriptRoot/build.sh" --restore --build --pack "$@"
. "$ScriptRoot/build.sh" --ci "$@"
50 changes: 26 additions & 24 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/CXXMethodDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
using System;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_CXXMethodDeclarationTest : CXXMethodDeclarationTest
{
protected override Task ConstructorTestImpl()
Expand Down Expand Up @@ -425,19 +427,19 @@ public unsafe partial struct MyStruct
public void** lpVtbl;

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType(MyStruct* pThis, int objA, int objB);
public delegate int _GetType(MyStruct* pThis, int obj);

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType1(MyStruct* pThis);

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType2(MyStruct* pThis, int obj);
public delegate int _GetType2(MyStruct* pThis, int objA, int objB);

public int GetType(int objA, int objB)
public int GetType(int obj)
{{
fixed (MyStruct* pThis = &this)
{{
return Marshal.GetDelegateForFunctionPointer<_GetType>((IntPtr)(lpVtbl[0]))(pThis, objA, objB);
return Marshal.GetDelegateForFunctionPointer<_GetType>((IntPtr)(lpVtbl[0]))(pThis, obj);
}}
}}

Expand All @@ -449,11 +451,11 @@ public new int GetType()
}}
}}

public int GetType(int obj)
public int GetType(int objA, int objB)
{{
fixed (MyStruct* pThis = &this)
{{
return Marshal.GetDelegateForFunctionPointer<_GetType2>((IntPtr)(lpVtbl[2]))(pThis, obj);
return Marshal.GetDelegateForFunctionPointer<_GetType2>((IntPtr)(lpVtbl[2]))(pThis, objA, objB);
}}
}}
}}
Expand Down Expand Up @@ -489,19 +491,19 @@ public unsafe partial struct MyStruct
public Vtbl* lpVtbl;

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType(MyStruct* pThis, int objA, int objB);
public delegate int _GetType(MyStruct* pThis, int obj);

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType1(MyStruct* pThis);

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType2(MyStruct* pThis, int obj);
public delegate int _GetType2(MyStruct* pThis, int objA, int objB);

public int GetType(int objA, int objB)
public int GetType(int obj)
{{
fixed (MyStruct* pThis = &this)
{{
return Marshal.GetDelegateForFunctionPointer<_GetType>(lpVtbl->GetType)(pThis, objA, objB);
return Marshal.GetDelegateForFunctionPointer<_GetType>(lpVtbl->GetType)(pThis, obj);
}}
}}

Expand All @@ -513,23 +515,23 @@ public new int GetType()
}}
}}

public int GetType(int obj)
public int GetType(int objA, int objB)
{{
fixed (MyStruct* pThis = &this)
{{
return Marshal.GetDelegateForFunctionPointer<_GetType2>(lpVtbl->GetType2)(pThis, obj);
return Marshal.GetDelegateForFunctionPointer<_GetType2>(lpVtbl->GetType2)(pThis, objA, objB);
}}
}}

public partial struct Vtbl
{{
[NativeTypeName(""int (int, int){nativeCallConv}"")]
[NativeTypeName(""int (int){nativeCallConv}"")]
public new IntPtr GetType;

[NativeTypeName(""int (){nativeCallConv}"")]
public IntPtr GetType1;

[NativeTypeName(""int (int){nativeCallConv}"")]
[NativeTypeName(""int (int, int){nativeCallConv}"")]
public IntPtr GetType2;
}}
}}
Expand Down Expand Up @@ -565,19 +567,19 @@ public unsafe partial struct MyStruct : MyStruct.Interface
public Vtbl* lpVtbl;

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType(MyStruct* pThis, int objA, int objB);
public delegate int _GetType(MyStruct* pThis, int obj);

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType1(MyStruct* pThis);

[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
public delegate int _GetType2(MyStruct* pThis, int obj);
public delegate int _GetType2(MyStruct* pThis, int objA, int objB);

public int GetType(int objA, int objB)
public int GetType(int obj)
{{
fixed (MyStruct* pThis = &this)
{{
return Marshal.GetDelegateForFunctionPointer<_GetType>(lpVtbl->GetType)(pThis, objA, objB);
return Marshal.GetDelegateForFunctionPointer<_GetType>(lpVtbl->GetType)(pThis, obj);
}}
}}

Expand All @@ -589,32 +591,32 @@ public new int GetType()
}}
}}

public int GetType(int obj)
public int GetType(int objA, int objB)
{{
fixed (MyStruct* pThis = &this)
{{
return Marshal.GetDelegateForFunctionPointer<_GetType2>(lpVtbl->GetType2)(pThis, obj);
return Marshal.GetDelegateForFunctionPointer<_GetType2>(lpVtbl->GetType2)(pThis, objA, objB);
}}
}}

public interface Interface
{{
int GetType(int objA, int objB);
int GetType(int obj);

int GetType();

int GetType(int obj);
int GetType(int objA, int objB);
}}

public partial struct Vtbl
{{
[NativeTypeName(""int (int, int){nativeCallConv}"")]
[NativeTypeName(""int (int){nativeCallConv}"")]
public new IntPtr GetType;

[NativeTypeName(""int (){nativeCallConv}"")]
public IntPtr GetType1;

[NativeTypeName(""int (int){nativeCallConv}"")]
[NativeTypeName(""int (int, int){nativeCallConv}"")]
public IntPtr GetType2;
}}
}}
Expand Down
2 changes: 2 additions & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/DeprecatedToObsoleteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_DeprecatedToObsoleteTest : DeprecatedToObsoleteTest
{
protected override Task SimpleStructMembersImpl(string nativeType, string expectedManagedType)
Expand Down
6 changes: 4 additions & 2 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/EnumDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

using System.Collections.Generic;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_EnumDeclarationTest : EnumDeclarationTest
{
protected override Task BasicTestImpl()
Expand Down Expand Up @@ -572,7 +574,7 @@ public enum MyEnum2

public static partial class Methods
{
public const int MyEnum1_Value1 = 1;
public const uint MyEnum1_Value1 = 1;
}
}
";
Expand All @@ -595,7 +597,7 @@ protected override Task WithReferenceToAnonymousEnumEnumeratorTestImpl()
{
public static partial class Methods
{
public const int MyEnum1_Value1 = 1;
public const uint MyEnum1_Value1 = 1;

[NativeTypeName(""const int"")]
public const int MyEnum2_Value1 = (int)(MyEnum1_Value1) + 1;
Expand Down
2 changes: 2 additions & 0 deletions ...harp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/FunctionDeclarationBodyImportTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_FunctionDeclarationBodyImportTest : FunctionDeclarationBodyImportTest
{
protected override Task ArraySubscriptTestImpl()
Expand Down
2 changes: 2 additions & 0 deletions ...Sharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/FunctionDeclarationDllImportTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_FunctionDeclarationDllImportTest : FunctionDeclarationDllImportTest
{
protected override Task BasicTestImpl()
Expand Down
2 changes: 2 additions & 0 deletions ...ngSharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/FunctionPointerDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_FunctionPointerDeclarationTest : FunctionPointerDeclarationTest
{
protected override Task BasicTestImpl()
Expand Down
6 changes: 5 additions & 1 deletion tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/StructDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_StructDeclarationTest : StructDeclarationTest
{
protected override Task IncompleteArraySizeTestImpl(string nativeType, string expectedManagedType)
Expand Down Expand Up @@ -1942,7 +1944,9 @@ public partial struct MyStruct3

protected override Task WithPackingTestImpl()
{
const string InputContents = @"struct MyStruct
const string InputContents = @"typedef int size_t;

struct MyStruct
{
size_t FixedBuffer[1];
};
Expand Down
3 changes: 2 additions & 1 deletion tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/UnionDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_UnionDeclarationTest : UnionDeclarationTest
{
protected override Task BasicTestImpl(string nativeType, string expectedManagedType)
Expand Down
2 changes: 2 additions & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleUnix/VarDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

using System.Collections.Generic;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("unix")]
public sealed class CSharpCompatibleUnix_VarDeclarationTest : VarDeclarationTest
{
protected override Task BasicTestImpl(string nativeType, string expectedManagedType)
Expand Down
2 changes: 2 additions & 0 deletions ...ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/CXXMethodDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
using System;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_CXXMethodDeclarationTest : CXXMethodDeclarationTest
{
protected override Task ConstructorTestImpl()
Expand Down
2 changes: 2 additions & 0 deletions ...ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/DeprecatedToObsoleteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_DeprecatedToObsoleteTest : DeprecatedToObsoleteTest
{
protected override Task SimpleStructMembersImpl(string nativeType, string expectedManagedType)
Expand Down
2 changes: 2 additions & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/EnumDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

using System.Collections.Generic;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_EnumDeclarationTest : EnumDeclarationTest
{
protected override Task BasicTestImpl()
Expand Down
2 changes: 2 additions & 0 deletions ...p.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/FunctionDeclarationBodyImportTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_FunctionDeclarationBodyImportTest : FunctionDeclarationBodyImportTest
{
protected override Task ArraySubscriptTestImpl()
Expand Down
2 changes: 2 additions & 0 deletions ...rp.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/FunctionDeclarationDllImportTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_FunctionDeclarationDllImportTest : FunctionDeclarationDllImportTest
{
protected override Task BasicTestImpl()
Expand Down
2 changes: 2 additions & 0 deletions ...harp.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/FunctionPointerDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_FunctionPointerDeclarationTest : FunctionPointerDeclarationTest
{
protected override Task BasicTestImpl()
Expand Down
2 changes: 2 additions & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/StructDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_StructDeclarationTest : StructDeclarationTest
{
protected override Task IncompleteArraySizeTestImpl(string nativeType, string expectedManagedType)
Expand Down
3 changes: 2 additions & 1 deletion tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpCompatibleWindows/UnionDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.

using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using NUnit.Framework;

namespace ClangSharp.UnitTests;

[Platform("win")]
public sealed class CSharpCompatibleWindows_UnionDeclarationTest : UnionDeclarationTest
{
protected override Task BasicTestImpl(string nativeType, string expectedManagedType)
Expand Down
Loading