[[ Tests ]] Allow database tests to run on mac

livecodeali · livecodeali · commit da06c9018150 · 2017-08-31T13:35:19.000+01:00
diff --git a/tests/_testlib.livecodescript b/tests/_testlib.livecodescript
@@ -355,16 +355,29 @@ on TestLoadExternal pExternal
    local tEnginePath
    put specialfolderpath("engine") into tEnginePath
 
+   local tExternalsPath, tExtension
+   set the itemdelimiter to slash
    if the platform is "MacOS" then
-      set the externals of the templateStack to tEnginePath & slash & pExternal & ".bundle"
+      put item 1 to -4 of tEnginePath into tExternalsPath
+      put "bundle" into tExtension
    else if the platform is "linux" then
-      set the externals of the templateStack to tEnginePath & slash & pExternal & ".so"
+      put tEnginePath into tExternalsPath
+      put "so" into tExtension
    end if
 
+   set the externals of the templateStack to tExternalsPath & slash & \
+      pExternal & "." & tExtension
+
    create stack pExternal && "External"
    start using it
    if the externalCommands of it is empty then
       write "Cannot load external" && pExternal & return to stderr
+      quit 1
+   end if
+   
+   -- Ensure drivers can be found
+   if pExternal is "revdb" then
+      revSetDatabaseDriverPath tExternalsPath
    end if
 end TestLoadExternal 
 
@@ -562,6 +575,27 @@ private function __MeetsRequirements pRequirement, pOptions
          return the platform is not "HTML5"
       case "write"
          return the platform is not "HTML5" and ("disk" is in the securityPermissions or the secureMode is false)
+      case "ui"
+         return not (the environment ends with "command line")
+      case "desktop"
+         return the platform is among the items of "MacOS,Win32,Linux"
+      case "mobile"
+         return the platform is among the items of "Android,iOS"
+      case "external"
+         -- TODO: make externals tests work in standalone test builder
+         if TestIsInStandalone() then
+            return false
+         end if
+         return the platform is not "HTML5"
+      case "database"
+         if not __MeetsRequirements("external", "revdb") then
+            return false
+         end if
+         if "odbc" is among the items of pOptions or \ 
+               "postgresql" is among the items of pOptions then
+            return __MeetsRequirements("desktop")
+         end if  
+         return the platform is not "HTML5"
    end switch
    return true
 end __MeetsRequirements
diff --git a/tests/lcs/core/database/db_getters.livecodescript b/tests/lcs/core/database/db_getters.livecodescript
@@ -39,11 +39,16 @@ command createTables pConnection, pStrings
 end createTables
 
 on TestDBTableGettersMySQL
-   TestSkip "skipping DB test","cannot use revOpenDatabase"
+   TestSkip "skipping DB test", "cannot use mysql in database tests"
    exit TestDBTableGettersMySQL
+   
+   TestSkipIfNot "database", "mysql"
+
+   TestLoadExternal "revdb"
+   
    local tArray
    put generateStrings() into tArray
-   local  tDatabaseID, tNames
+   local tDatabaseID, tNames
    put revOpenDatabase("mysql","localhost","t2","root","test_password",false,"/tmp/mysql.sock",10,true) into tDatabaseID
    createTables(tDatabaseID, tArray)
    put revDatabaseTableNames(tDatabaseID) into tNames
diff --git a/tests/lcs/core/database/sqlite_binary_insert.livecodescript b/tests/lcs/core/database/sqlite_binary_insert.livecodescript
@@ -50,9 +50,8 @@ private function __retrBinaryData pTable, pData
 end __retrBinaryData
 
 on TestSetup
-   if the platform is not "linux" then
-      return "SKIP database tests can only be run on Linux"
-   end if
+   TestSkipIfNot "database", "sqlite"
+   TestSkipIfNot "external", "revsecurity"
    
    TestLoadExternal "revdb"
    
