Skip to content

Commit 9a38405

Browse files
committed
test: add .so file to the BundleStructureTest
1 parent 54fc425 commit 9a38405

File tree

7 files changed

+19
-0
lines changed

7 files changed

+19
-0
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NoneQ
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NoneQ
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NoneQ

tests/dotnet/BundleStructure/shared.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
<!-- Bundled, linked with -->
5555
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5656
</None>
57+
<None Include="$(RootTestsDirectory)/test-libraries/libraries/.libs/$(RuntimeIdentifier)/libNoneE.so">
58+
<!-- Bundled, not linked with -->
59+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
60+
</None>
5761
<None Include="$(RootTestsDirectory)/test-libraries/libraries/.libs/$(RuntimeIdentifier)/libNoneF.a">
5862
<!-- Not bundled; linked with -->
5963
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -103,6 +107,10 @@
103107
<!-- Bundled, linked with, install_name_tool must have been executed -->
104108
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
105109
</None>
110+
<None Include="$(RootTestsDirectory)/test-libraries/libraries/.libs/$(RuntimeIdentifier)/libSkipInstallNameTool.so">
111+
<!-- Bundled, not linked with, install_name_tool must have been executed -->
112+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113+
</None>
106114
</ItemGroup>
107115

108116
<ItemGroup>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NoneQ

tests/dotnet/UnitTests/BundleStructureTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string [] r
120120
expectedFiles.Add ($"{assemblyDirectory}NoneC.pdb");
121121
expectedFiles.Add ($"{assemblyDirectory}NoneD.exe");
122122
expectedFiles.Add ($"{assemblyDirectory}libNoneE.dylib");
123+
expectedFiles.Add ($"{assemblyDirectory}libNoneE.so");
123124
// NoneF.a is not bundled
124125
// Sub/NoneG.txt is not bundled
125126
// Sub/NoneH.txt is not bundled
@@ -129,6 +130,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string [] r
129130
expectedFiles.Add ($"{assemblyDirectory}NoneL.config");
130131
// NoneM.unknown is not bundled
131132
expectedFiles.Add ($"{assemblyDirectory}libSkipInstallNameTool.dylib");
133+
expectedFiles.Add ($"{assemblyDirectory}libSkipInstallNameTool.so");
132134

133135
expectedFiles.Add ($"{resourcesDirectory}basn3p08.png");
134136
expectedFiles.Add ($"{resourcesDirectory}basn3p08_with_loc.png");
@@ -335,6 +337,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string [] r
335337
Assert.That (missingFiles, Is.Empty, "No missing files");
336338

337339
AssertDynamicLibraryId (platform, appPath, assemblyDirectory, "libSkipInstallNameTool.dylib");
340+
AssertDynamicLibraryId (platform, appPath, assemblyDirectory, "libSkipInstallNameTool.so");
338341
AssertLibraryArchitectures (appPath, runtimeIdentifiers);
339342
}
340343

tests/test-libraries/libraries/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $(1)_$(3)_TARGETS += \
3535
.libs/$(3)/lib$(1).a \
3636
.libs/$(3)/lib$(1).o \
3737
.libs/$(3)/lib$(1).dylib \
38+
.libs/$(3)/lib$(1).so \
3839

3940
$(3)_TARGETS += \
4041
$$($(1)_$(3)_TARGETS) \
@@ -56,6 +57,9 @@ endif
5657
.libs/$(3)/lib$(1).a: .libs/$(3)/lib$(1).o
5758
$$(call Q_2,AR [$(1)]) $(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cru $$@ $$<
5859

60+
.libs/$(3)/lib$(1).so: .libs/$(3)/lib$(1).dylib
61+
$$(Q) $(CP) .libs/$(3)/lib$(1).dylib .libs/$(3)/lib$(1).so
62+
5963
$$($(3)_$(1)_DIRECTORIES):
6064
$$(Q) mkdir -p $$@
6165

0 commit comments

Comments
 (0)