test: partial linux support for the integration test

getsentry · Feb 16, 2022 · fe339cf · fe339cf
1 parent 4e7f8d9
commit fe339cf
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -183,15 +183,15 @@ jobs:
 
       - name: Integration Test - Build Standalone Player without Sentry SDK
         shell: pwsh
-        run: ./test/Scripts.Integration.Test/integration-build-project.ps1 "$env:UNITY_PATH" Builder.BuildWindowsIl2CPPPlayer
+        run: ./test/Scripts.Integration.Test/integration-build-project.ps1 "$env:UNITY_PATH"
 
       - name: Integration Test - Add Sentry to test project
         shell: pwsh
         run: ./test/Scripts.Integration.Test/integration-update-sentry.ps1 "$env:UNITY_PATH"
 
       - name: Integration Test - Build Standalone Player Sentry SDK
         shell: pwsh
-        run: ./test/Scripts.Integration.Test/integration-build-project.ps1 "$env:UNITY_PATH" Builder.BuildWindowsIl2CPPPlayer
+        run: ./test/Scripts.Integration.Test/integration-build-project.ps1 "$env:UNITY_PATH"
 
       - name: Integration Test - Run Player - Smoke Test
         shell: pwsh

diff --git a/samples/unity-of-bugs/Assets/Editor/Builder.cs b/samples/unity-of-bugs/Assets/Editor/Builder.cs
@@ -20,7 +20,7 @@ public static void BuildIl2CPPPlayer(BuildTarget buildTarget)
 
         var buildPlayerOptions = new BuildPlayerOptions
         {
-            scenes = new[] {"Assets/Scenes/1_Bugfarm.unity"},
+            scenes = new[] { "Assets/Scenes/1_Bugfarm.unity" },
             locationPathName = args["buildPath"],
             target = buildTarget,
             options = BuildOptions.StrictMode,
@@ -60,6 +60,7 @@ public static void BuildIl2CPPPlayer(BuildTarget buildTarget)
 
     public static void BuildWindowsIl2CPPPlayer() => BuildIl2CPPPlayer(BuildTarget.StandaloneWindows64);
     public static void BuildMacIl2CPPPlayer() => BuildIl2CPPPlayer(BuildTarget.StandaloneOSX);
+    public static void BuildLinuxIl2CPPPlayer() => BuildIl2CPPPlayer(BuildTarget.StandaloneLinux64);
     public static void BuildAndroidIl2CPPPlayer() => BuildIl2CPPPlayer(BuildTarget.Android);
     public static void BuildIOSPlayer() => BuildIl2CPPPlayer(BuildTarget.iOS);
 
@@ -79,7 +80,7 @@ private static void SetupSentryOptions(Dictionary<string, string> args)
         {
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies().Where(name => name.FullName.Contains("Sentry")))
             {
-                foreach(var type in asm.GetTypes())
+                foreach (var type in asm.GetTypes())
                 {
                     Debug.LogFormat(LogType.Log, LogOption.NoStacktrace, null, "SetupSentryOptions: Asm {0} Type {1}", asm.FullName, type.FullName);
                 }

diff --git a/test/Scripts.Integration.Test/IntegrationGlobals.ps1 b/test/Scripts.Integration.Test/IntegrationGlobals.ps1
@@ -22,9 +22,12 @@ function GetTestAppName
     {
         return "test.exe"
     }
+    ElseIf ($buildMethod.contains("Linux")) {
+        return "test"
+    }
     Else
     {
-        Throw "Cannot find Test App name for the current operating system"
+        Throw "Cannot find Test App name for the given buildMethod: '$buildMethod'"
     }
 }
 

diff --git a/test/Scripts.Integration.Test/integration-build-project.ps1 b/test/Scripts.Integration.Test/integration-build-project.ps1
@@ -20,6 +20,9 @@ if ("$BuildMethod" -eq "")
     {
         $BuildMethod = "Builder.BuildWindowsIl2CPPPlayer"
     }
+    ElseIf ($IsLinux) {
+        $BuildMethod = "Builder.BuildLinuxIl2CPPPlayer"
+    }
     Else
     {
         Throw "Unsupported build"

diff --git a/test/Scripts.Integration.Test/integration-run-smoke-test.ps1 b/test/Scripts.Integration.Test/integration-run-smoke-test.ps1
@@ -1,12 +1,22 @@
 . ./test/Scripts.Integration.Test/IntegrationGlobals.ps1
 
+
 If ($IsMacOS)
 {
-    $testAppPath = $testAppPath + "/Contents/MacOS/$NewProjectName"
+    $testAppPath = "$NewProjectBuildPath/test.app/Contents/MacOS/$NewProjectName"
+}
+ElseIf ($IsWindows)
+{
+    $testAppPath = "$NewProjectBuildPath/test.app/Contents/MacOS/test.exe"
 }
-else
+ElseIf ($IsLinux) {
+    $testAppPath = "$NewProjectBuildPath/test"
+    bash -c "find $testAppPath -name test"
+    # $testAppPath = $testAppPath + "/Contents/MacOS/test.exe"
+}
+Else
 {
-    $testAppPath = $testAppPath + "/Contents/MacOS/test.exe"
+    Throw "Unsupported build"
 }
 
 $process = Start-Process -FilePath "$testAppPath"  -ArgumentList "--test", "smoke" -PassThru