Changeset 101 for trunk/Platforms/Test/Makefile

Timestamp:

Jan 15, 2009, 6:19:08 PM (16 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

File:

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

trunk/Platforms/Test/Makefile

@@ -35 +35 @@
 DIR_OBJ                         =       $(DIR_TMP)/obj
 DIR_BIN                         =       $(DIR_TMP)/bin
-DIR_LOG                         =       ./log
+DIR_LOG                         =       $(DIR_TMP)/log
 DIR_DATA                        =       ./data
 DIR_SOFT                        =       $(MORPHEO_TOPLEVEL)/Softwares
@@ -115 +115 @@
                                 fi;                                                     \
                                 $(MAKE) $$logs;                                         \
-                                declare -i have_test_ko=0;                              \
+                                declare -i nb_test=0;                                   \
+                                declare -i nb_test_ko=0;                                \
                                 for log in $$logs; do                                   \
                                         $(GREP) -q "Test OK" $$log;                     \
@@ -122 +123 @@
                                         declare -i test_ko=$$?;                         \
                                         if $(TEST) $$test_ko -eq 0 -o $$test_ok -ne 0;  \
-                                        then have_test_ko=1;                            \
+                                        then nb_test_ko=$$(($${nb_test_ko} + 1));       \
                                         fi;                                             \
+                                        nb_test=$$(($${nb_test} + 1));                  \
                                 done;                                                   \
-                                if $(TEST) $$have_test_ko -ne 0;                        \
-                                then $(ECHO) "-------------------| Test KO"; exit 1;    \
+                                if $(TEST) $${nb_test_ko} -ne 0;                        \
+                                then $(ECHO) "-------------------| Test KO !!! ($${nb_test_ko}/$${nb_test})"; exit 1;   \
                                 else $(ECHO) "-------------------| Test OK"; exit 0;    \
                                 fi;
 
 execute                         : run
-
 
 $(DIR_LOG)/%.log                : %.cfg
@@ -146 +147 @@
                                 declare timing=$$($(GREP) -h "Timing" $$log);           \
                                 if $(TEST) $$test_ko -ne 0 -a $$test_ok -eq 0;          \
-                                then $(ECHO) -e "                     $$file ... OK\t$$timing"; \
-                                else $(ECHO) -e "                     $$file ... KO\t$$timing"; \
-                                     have_test_ko=1;                                    \
+                                then $(ECHO) -e "                     $$file ... OK    \t$$timing";     \
+                                else $(ECHO) -e "                     $$file ... KO !!!\t$$timing";     \
                                 fi;                                                     \