Changeset 120 for trunk/Platforms/Test/Makefile

Timestamp:

May 26, 2009, 9:01:47 PM (16 years ago)

Author:

rosiere

Message:

1) Context_state : Add statistics
2) Add configuration with multi front_end
3) Add optionnal pid at log filename

File:

• trunk/Platforms/Test/Makefile (modified) (5 diffs)

trunk/Platforms/Test/Makefile

@@ -30 +30 @@
 ifeq ($(origin PRIORITY), undefined)
 PRIORITY                        = 0
+endif
+ifeq ($(flavor CLEAN), undefined)
+CLEAN                           = 0
 endif
 
@@ -134 +137 @@
 run                             :
                                 @\
-                                if $(TEST) "$(DATA)" != "$(DATA_ALL)"; then             \
-                                        $(RM) $(DIR_LOG)/$(DATA);                       \
-                                fi;                                                     \
-                                $(MAKE) $(DIR_LOGS);                                    \
-                                declare logs="$(LOGS)";                                 \
-                                $(MAKE) $$logs;                                         \
-                                declare -i nb_test=0;                                   \
-                                declare -i nb_test_ko=0;                                \
-                                for log in $$logs; do                                   \
-                                        $(GREP) -q "Test OK" $$log;                     \
-                                        declare -i test_ok=$$?;                         \
-                                        $(GREP) -q "Test KO" $$log;                     \
-                                        declare -i test_ko=$$?;                         \
-                                        if $(TEST) $$test_ko -eq 0 -o $$test_ok -ne 0;  \
-                                        then nb_test_ko=$$(($${nb_test_ko} + 1));       \
-                                        fi;                                             \
-                                        nb_test=$$(($${nb_test} + 1));                  \
-                                done;                                                   \
-                                if $(TEST) $${nb_test_ko} -ne 0;                        \
+                                declare -i clean=$(CLEAN);                                                              \
+                                if $(TEST) $${clean} -ne 0 -a "$(DATA)" != "$(DATA_ALL)"; then                          \
+                                        $(RM) $(DIR_LOG)/$(DATA);                                                       \
+                                fi;                                                                                     \
+                                $(MAKE) $(DIR_LOGS);                                                                    \
+                                declare logs="$(LOGS)";                                                                 \
+                                $(MAKE) $${logs};                                                                       \
+                                declare -i nb_test=0;                                                                   \
+                                declare -i nb_test_ko=0;                                                                \
+                                for log in $${logs}; do                                                                 \
+                                        $(GREP) -q "Test OK" $$log;                                                     \
+                                        declare -i test_ok=$$?;                                                         \
+                                        $(GREP) -q "Test KO" $$log;                                                     \
+                                        declare -i test_ko=$$?;                                                         \
+                                        if $(TEST) $${test_ko} -eq 0 -o $${test_ok} -ne 0;                              \
+                                        then nb_test_ko=$$(($${nb_test_ko} + 1));                                       \
+                                        fi;                                                                             \
+                                        nb_test=$$(($${nb_test} + 1));                                                  \
+                                done;                                                                                   \
+                                if $(TEST) $${nb_test_ko} -ne 0;                                                        \
                                 then $(ECHO) "-------------------| Test KO !!! ($${nb_test_ko}/$${nb_test})"; exit 1;   \
-                                else $(ECHO) "-------------------| Test OK"; exit 0;    \
+                                else $(ECHO) "-------------------| Test OK"; exit 0;                                    \
                                 fi;
 
@@ -161 +165 @@
 debug                           :
                                 @\
-                                $(MAKE) run DATA=debug;
+                                $(MAKE) run DATA=debug CLEAN=1;
 
 bench                           :
@@ -179 +183 @@
                                 declare -i test_ko=$$?;                                 \
                                 declare timing=$$($(GREP) -h "Timing" $$log);           \
-                                if $(TEST) $$test_ko -ne 0 -a $$test_ok -eq 0;          \
+                                if $(TEST) $${test_ko} -ne 0 -a $${test_ok} -eq 0;      \
                                 then test="... OK    ";                                 \
                                 else test="... KO !!!";                                 \
@@ -241 +245 @@
                                 $(ECHO) " * all (default rules) : create software";\
                                 $(ECHO) " * run                 : execute platforms with test configuration";\
-                                $(ECHO) "                         set DATA to select a specific directory in $(DIR_DATA) (default : all)";\
+                                $(ECHO) "                         set DATA     to select a specific directory in $(DIR_DATA) (default : all)";\
                                 $(ECHO) "                         set PRIORITY to nice the execution (default : 0)";\
-                                $(ECHO) "                         example : make run DATA=debug PRIORITY=10";\
+                                $(ECHO) "                         set CLEAN    to remove previous log (default : 0)";\
+                                $(ECHO) "                         example : make run DATA=debug PRIORITY=10 CLEAN";\
                                 $(ECHO) " * execute             : cf 'make run'";\
                                 $(ECHO) " * debug               : cf 'make run DATA=debug'";\