X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FHiDPISettingTest2.java;h=87a26d1ac8b2e74d82ae8eb09fa95b8a5d6fd2d7;hb=c3d723759ba265ecdd89ddef7d59ebc9f33de784;hp=9851b09c694aaf8fa7c5ce0d18b7f615ce0fe4ae;hpb=58f6e2a689afae0b869f28f8874cd735f0cfd129;p=jalview.git diff --git a/test/jalview/bin/HiDPISettingTest2.java b/test/jalview/bin/HiDPISettingTest2.java index 9851b09..87a26d1 100644 --- a/test/jalview/bin/HiDPISettingTest2.java +++ b/test/jalview/bin/HiDPISettingTest2.java @@ -30,6 +30,7 @@ import java.io.InputStreamReader; import java.util.concurrent.TimeUnit; import org.testng.Assert; +import org.testng.SkipException; import org.testng.annotations.BeforeTest; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -37,6 +38,7 @@ import org.testng.annotations.Test; import io.github.classgraph.ClassGraph; import io.github.classgraph.ScanResult; import jalview.gui.Desktop; +import jalview.util.Platform; public class HiDPISettingTest2 { @@ -127,7 +129,7 @@ public class HiDPISettingTest2 String classpath = getClassPath(); String cmd = java_exe + " " + " -classpath " + classpath + " " + jvmArgs + " jalview.bin.Jalview " + " " - + "-props test/jalview/bin/hidpiTestProps.jvprops " + appArgs; + + "--props=test/jalview/bin/hidpiTestProps.jvprops " + appArgs; Process proc = null; Worker worker = null; try @@ -160,6 +162,13 @@ public class HiDPISettingTest2 @Test(groups = { "Functional" }, dataProvider = "hidpiScaleArguments") public void testHiDPISettings(int scale) { + if (!Platform.isLinux()) + { + throw new SkipException( + "Not linux platform, not testing actual scaling with " + + HiDPISetting.scalePropertyName); + } + String jvmArgs = HiDPISetting.getScalePropertyArg(scale); String appArgs = " -open examples/uniref50.fa -nosplash -nonews -noquestionnaire -nousagestats -nowebservicediscovery";