[Libreoffice-commits] core.git: Branch 'aoo/trunk' - qadevOOo/runner

Damjan Jovanovic damjan at apache.org
Sat Dec 31 14:08:44 UTC 2016


 qadevOOo/runner/helper/BuildEnvTools.java |    3 ++-
 qadevOOo/runner/lib/TestParameters.java   |    2 ++
 qadevOOo/runner/util/PropertyName.java    |    4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit dfe65bf2297cad61734ca386b0905d06bb2ad03a
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sat Dec 31 11:16:08 2016 +0000

    Add FreeBSD as known platform to main/qadevOOo.
    
    Patch by: me

diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java
index e4270f2..4c3c373 100644
--- a/qadevOOo/runner/helper/BuildEnvTools.java
+++ b/qadevOOo/runner/helper/BuildEnvTools.java
@@ -77,10 +77,11 @@ public class BuildEnvTools {
             (!mPlatform.equalsIgnoreCase(PropertyName.UNXSOLI)) &&
             (!mPlatform.equalsIgnoreCase(PropertyName.UNXLNGI)) &&
             (!mPlatform.equalsIgnoreCase(PropertyName.UNXMACXI))&&
+            (!mPlatform.equalsIgnoreCase(PropertyName.UNXFBSDX))&&
             (!mPlatform.equalsIgnoreCase(PropertyName.WNTMSCI)) ){
 
             msg += PropertyName.OPERATING_SYSTEM + ":" + mPlatform + "\nFill this parameter with an operating system like unxsols," +
-                " unxsoli, unxlngi, unxmacxi or wntmsci.  \n\n";
+                " unxsoli, unxlngi, unxfbsdx, unxmacxi or wntmsci.  \n\n";
             error = true;
         }
 
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 8892d5a..b77462d 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -329,6 +329,8 @@ public class TestParameters extends Hashtable {
             }
         } else if (osname.indexOf ("mac")>-1) {
             operatingSystem = PropertyName.UNXMACXI;
+        } else if (osname.equals("freebsd")) {
+            operatingSystem = PropertyName.UNXFBSDX;
         } else {
             System.out.println("ERROR: not supported platform: " + osname);
             System.exit(1);
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 9ace99c..d979f7a 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -144,6 +144,10 @@ public interface PropertyName {
     /**
      * internal only, no parameter
      */
+    final public static String UNXFBSDX = "unxfbsdx";
+    /**
+     * internal only, no parameter
+     */
     final public static String UNXLNGI = "unxlngi";
     /**
      * internal only, no parameter


More information about the Libreoffice-commits mailing list