Adapt SALOME non-regression test bases for salome test driver

[modules/kernel.git] / bin / appliskel / salome

diff --git a/bin/appliskel/salome b/bin/appliskel/salome
index 5d56e01f207015c765e77573d14a6512496ebed1..2c408be42cff46ad267b3f46fd6a3b75775a26c4 100755 (executable)
--- a/bin/appliskel/salome
+++ b/bin/appliskel/salome
@@ -1,6 +1,5 @@
-#! /usr/bin/env python
-
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+#! /usr/bin/env python3
+# Copyright (C) 2013-2020  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,59 +18,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-import os
+import salome_common
 import sys
 
-def main(args):
-  # Identify application path then locate configuration files
-  currentPath = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
-  launcherFile = os.path.basename(__file__)
-  from salome_starter import initialize
-  initialize(currentPath, launcherFile)
-
-  if len(args) == 1 and args[0] in ['--help', 'help', '-h', '--h']:
-    from salomeContext import usage
-    usage()
-    sys.exit(0)
-
-  from salomeContextUtils import getConfigFileNames
-  configFileNames, extraEnv, args, unexisting = getConfigFileNames(args, checkExistence=True)
-
-  if len(unexisting) > 0:
-    print "ERROR: unexisting configuration/environment file(s): " + ', '.join(unexisting)
-    sys.exit(1)
-
-  # Create a SalomeContext which parses configFileNames to initialize environment
-  from salomeContextUtils import SalomeContextException
-  try:
-    from salomeContext import SalomeContext
-    context = SalomeContext(configFileNames)
-
-    # Here set specific variables, if needed
-    # context.addToPath('mypath')
-    # context.addToLdLibraryPath('myldlibrarypath')
-    # context.addToPythonPath('mypythonpath')
-    # context.setVariable('myvarname', 'value')
-
-    if extraEnv:
-      for key,val in extraEnv.items():
-        context.addToVariable(key,val)
-
-    # Start SALOME, parsing command line arguments
-    (out, err), returncode = context.runSalome(args)
-    if out:
-      sys.stdout.write(out)
-    if err:
-      sys.stderr.write(err)
-    #print 'Thank you for using SALOME!'
-    sys.exit(returncode)
-  except SalomeContextException, e:
-    import logging
-    logging.getLogger("salome").error(e)
-    sys.exit(1)
-#
-
 if __name__ == "__main__":
-  args = sys.argv[1:]
-  main(args)
-#
+    salome_common.main(sys.argv[1:])