From b90ab2de75a056571cf0cd34df0a648b02cb7473 Mon Sep 17 00:00:00 2001 From: Eric F Date: Mon, 21 Sep 2020 11:16:56 +0200 Subject: [PATCH] =?utf8?q?-=20Am=C3=A9liorations=20lancements=20des=20test?= =?utf8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Tests/MappingAccasXsd/GNUmakefile | 4 ++-- .../cata_ASSD_test_driver_0.comm | 6 +++++ .../cata_UserAssd_test_driver_0.comm | 23 +++++++------------ 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 Tests/MappingAccasXsd/cata_ASSD_test_driver_0.comm diff --git a/Tests/MappingAccasXsd/GNUmakefile b/Tests/MappingAccasXsd/GNUmakefile index a3486056..54a174d8 100644 --- a/Tests/MappingAccasXsd/GNUmakefile +++ b/Tests/MappingAccasXsd/GNUmakefile @@ -42,7 +42,7 @@ $(eval $(call cata_dependencies,.xsd)) # $(subst .py,.xsd,cata_dependencies) -cata_files= cata_1.py cata_UserAssd.py +cata_files= cata_1.py cata_UserAssd.py cata_ASSD.py xsd_files = $(cata_files:%.py=%.xsd) driver_files= $(cata_files:%.py=%_driver.py) @@ -87,7 +87,7 @@ testGen: $(confdir)/test_driver_subst.py #Lancement de chaque test ds l'environement minimal testAll: testGen exec.sh driverAll - for i in `ls *_test_driver*.py` ; do ./exec.sh python $$i ; done + for i in `ls *_test_driver*.py` ; do echo "------ Launching $$i ------" && ./exec.sh python $$i ; done #multiple target avec règle non possible. #Ecrire une génération avec un define diff --git a/Tests/MappingAccasXsd/cata_ASSD_test_driver_0.comm b/Tests/MappingAccasXsd/cata_ASSD_test_driver_0.comm new file mode 100644 index 00000000..31567b0c --- /dev/null +++ b/Tests/MappingAccasXsd/cata_ASSD_test_driver_0.comm @@ -0,0 +1,6 @@ + +maillage1=Maillage(fichier='/home/eric/MED/med-4.1.0/tests/c/test1.med',); + +champ1=Champ(SurLeMaillage=maillage1,); +#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE +#CHECKSUM:4f3412e3098e0105441fa5b9d25276c9 -:FIN CHECKSUM \ No newline at end of file diff --git a/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm b/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm index 00032190..8c85b835 100644 --- a/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm +++ b/Tests/MappingAccasXsd/cata_UserAssd_test_driver_0.comm @@ -1,21 +1,14 @@ -iFTP1=laClasseUser() -iSO1=laClasseUser() -iSP1=laClasseUser() -iSL1=laClasseUser() -iSL2=laClasseUser() -iDefAndUse1=laClasseUser() +V=laClasseUser() -DefinitionDsFactDsProc(unFact=_F(creeUserAssd=iFTP1,),); +DefinitionDsFactDsProc(); -OP1=DefinitionDsSimpDsOper(creeUserAssd=iSO1,); +OO=DefinitionDsSimpDsOper(); -DefinitionDsSimpDsProc(creeUserAssd=iSP1,); +DefinitionDsSimpDsProc(); -DefinitionDsSimpListe(creeUserAssd=(iSL1,iSL2,),); +DefinitionDsSimpListe(); -UtiliseEtDefinitDsLeMemeProc(utiliseUserAssd=(iSL1,iSP1,iFTP1,iSL2,iSP1,iSO1,iDefAndUse1,), - creeUserAssd=iDefAndUse1,); +UtiliseEtDefinitDsLeMemeProc(utiliseUserAssd=(V,),); + +UtiliseUserAssD(utiliseListeUneListeUserAssd=(V,V,),); -UtiliseUserAssD(utiliseListeUneListeUserAssd=(iDefAndUse1,iSP1,iSL1,),); -#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE -#CHECKSUM:4f3e1937244a23724135d9fcf109e87c -:FIN CHECKSUM \ No newline at end of file -- 2.39.2