Changeset 1476

Timestamp:

2009-06-15T16:26:10+02:00 (15 years ago)

Author:

ctlod

Message:

improve the usability of NVTK to perform multi-tests, see ticket: #461

File:

• trunk/NVTK/Makefile (modified) (6 diffs)

trunk/NVTK/Makefile

@@ -5 +5 @@
 #
 # VARS TO SET: 6 + 1 (optional)
-#     - NAM_V      : name of the current test
+#     - NAM_V      : name of the current test (associated to the same directory name)
 #     - LISTE_CONF : configurations name (ORCA2_LIM, GYRE ...)
 #     - JOBS_2LAUN : jobs to launch (nojob, all, long, short or gtime)
@@ -28 +28 @@
 #-
 #- Name of the test
-NAM_V = MY_EXP1
+NAM_V = 2TEST
 #-
 #- Configurations list which must be tested
@@ -67 +67 @@
    @echo 
    @echo "CONFIGURATION :" $@
-   @( cd 2TEST ; MYREP_LIST=`( ls *.[Ffh]90 )` ; cd ../../$@/MY_SRC ; rm -rf *.[Ffh]90 ; \
-        if [ -n "$$MYREP_LIST" ] ; then ln -sf ../../NVTK/2TEST/*.[Ffh]90 . ; fi ; )
+   @( cd ${NAM_V} ; MYREP_LIST=`( ls *.[Ffh]90 )` ; cd ../../$@/MY_SRC ; rm -rf *.[Ffh]90 ; \
+        if [ -n "$$MYREP_LIST" ] ; then ln -sf ../../NVTK/${NAM_V}/*.[Ffh]90 . ; fi ; )
    @echo "test=" $(NAM_V) > ../$@/specifs.txt
    @echo "runs=" $(BUILD_MAKE) >> ../$@/specifs.txt
@@ -76 +76 @@
    @echo `svn info ../../modeles/NEMO | grep URL` >> ../$@/specifs.txt
    @echo `svn info ../../modeles/NEMO | grep Revision ` >> ../$@/specifs.txt
-   @( cd 2TEST ; LSFILES=`( ls *.[Ffh]90 )` ; if [ -n "$$LSFILES" ] ; \
+   @( cd ${NAM_V} ; LSFILES=`( ls *.[Ffh]90 )` ; if [ -n "$$LSFILES" ] ; \
      then echo $$LSFILES > ../../$@/f2test.txt ; else rm -f ../../$@/f2test.txt ; \
           touch ../../$@/f2test.txt ; fi ; )
    @echo 
-   @echo '             ----->>>>>>>>>   Links from NVTK/2TEST to '$@/MY_SRC 'done'
+   @echo '             ----->>>>>>>>>   Links from NVTK/'${NAM_V} ' to '$@/MY_SRC 'done'
    @echo 
    @echo '                              Build the Makefile for' $@ 'configuration'
@@ -90 +90 @@
 #- Rebuild dependencies when new cpp key and/or new module used
 dep: clear
-   for conf in ${LISTE_CONF}; do \
+   @for conf in ${LISTE_CONF}; do \
        echo ; \
        echo ; \
@@ -96 +96 @@
        echo '             ----->>>>>>>>> Rebuild dependencies for the' $$conf 'configuration' ; \
        echo ; \
-       echo '                          > Build links from 2TEST to '$$conf'/MY_SRC directory :' ; \
+       echo '                          > Build links from NVTK/'${NAM_V} ' to '$$conf'/MY_SRC directory :' ; \
        echo ; \
-       cd 2TEST ; \
+       cd ${NAM_V} ; \
        MYREP_LIST=`( ls *.[Ffh]90 )` ; \
             cd ../../$$conf/MY_SRC ; rm -rf *.[Ffh]90 ; \
             if [ -n "$$MYREP_LIST" ] ; \
             then for F in $$MYREP_LIST; do \
-            echo "                             # link from 2TEST to "$$conf"/MY_SRC/$$F" ; \
-                   ln -sf  ../../NVTK/2TEST/$$F . ; \
+            echo "                             # link from NVTK/"${NAM_V} "to "$$conf"/MY_SRC/$$F" ; \
+                   ln -sf  ../../NVTK/${NAM_V}/$$F . ; \
                 done ; fi ; \
        echo ; \