X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FVerima%2FpasseJobs.py;h=0adba66941e8bcbd8f9d170a110d203bc6d55fb5;hp=74cb9a078eeeec7d33e736d82498d2b4c1e1e8dc;hb=6d32f944a0a115b6419184c50b57bf7c4eef5786;hpb=442fd64c19a6e27a339ca36264c15ec91732cf32

diff --git a/src/Tools/Verima/passeJobs.py b/src/Tools/Verima/passeJobs.py
index 74cb9a078..0adba6694 100755
--- a/src/Tools/Verima/passeJobs.py
+++ b/src/Tools/Verima/passeJobs.py
@@ -1,31 +1,49 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
+# Copyright (C) 2013-2019  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 import sys
 import os
-from .Base.dataBase import Base
-from .Base.versions import Chercheversion
+from Base.dataBase import Base
+from Base.versions import Chercheversion
 
 
 if __name__ == "__main__":
-    from optparse import OptionParser
-    p=OptionParser()
-    p.add_option('-a',dest='all',action="store_true", default=False,help='passe l ensemble des Tests')
-    p.add_option('-s',dest='salomePath',help='chemin du runAppli',default="Appli")
-    p.add_option('-v',dest='version',help='id de la version')
-    p.add_option('-d',dest='database',default="myMesh.db",help='nom de la database')
-    p.add_option('-f',dest='force',default=True,help='force la passage des jobs meme si l execution a deja eu lieu sur cette machine pour cette version de salome')
-    options, args = p.parse_args()
-    if len(args) == 0  and options.all== False:
+    from argparse import ArgumentParser
+    p=ArgumentParser()
+    p.add_argument('-a',dest='all_tests',action="store_true", default=False,help='passe l ensemble des Tests')
+    p.add_argument('-s',dest='salomePath',help='chemin du lanceur salome',default="Appli")
+    p.add_argument('-v',dest='version',help='id de la version')
+    p.add_argument('-d',dest='database',default="myMesh.db",help='nom de la database')
+    p.add_argument('-f',dest='force',default=True,help='force la passage des jobs meme si l execution a deja eu lieu sur cette machine pour cette version de salome')
+    p.add_argument('job', nargs='*')
+    args = p.parse_args()
+    if len(args.job) == 0  and args.all_tests == False:
         print("Enter -a ou un numero de job")
         print(2)
         exit()
-    if options.salomePath==None :
-        print("chemin du runAppli obligatoire")
+    if args.salomePath is None :
+        print("chemin du lanceur salome obligatoire")
         exit()
-    if options.version==None :
-        options.version=Chercheversion(options.salomePath)
-    maBase=Base(options.database)
+    if args.version is None :
+        args.version=Chercheversion(args.salomePath)
+    maBase=Base(args.database)
     maBase.initialise()
-    maBase.passeJobs(options.all,options.salomePath,options.version,options.force,args)
+    maBase.passeJobs(args.all_tests,args.salomePath,args.version,args.force,args.job)
     maBase.close()