Index: trunk/Platforms/Test/Makefile
===================================================================
--- trunk/Platforms/Test/Makefile	(revision 114)
+++ trunk/Platforms/Test/Makefile	(revision 117)
@@ -1,2 +1,3 @@
+
 # 
 # $Id$
@@ -21,4 +22,12 @@
 ifeq ($(origin MORPHEO_TMP), undefined)
 	$(error "variable MORPHEO_TMP is undefined")
+endif
+
+DATA_ALL			= *
+ifeq ($(origin DATA), undefined)
+DATA				= $(DATA_ALL)
+endif
+ifeq ($(origin PRIORITY), undefined)
+PRIORITY			= 0
 endif
 
@@ -37,6 +46,7 @@
 DIR_BIN				=	$(DIR_TMP)/bin
 DIR_LOG				=	$(DIR_TMP)/log
-DIR_DATA_TEST			=	./data_test
-DIR_DATA_BENCH			=	./data_bench
+DIR_DATA			=	./data
+DIR_LOGS			=	$(patsubst $(DIR_DATA)/%,$(DIR_LOG)/%,$(wildcard $(DIR_DATA)/*))
+
 DIR_SOFT			=	$(MORPHEO_TOPLEVEL)/Softwares
 
@@ -57,35 +67,30 @@
 #----------------------------------------------------------
 #----------------------------------------------------------
-
 SOURCES				=	$(wildcard $(DIR_SRC)/*.cpp)
 OBJECTS				=	$(patsubst $(DIR_SRC)/%.cpp,$(DIR_OBJ)/%.o,$(SOURCES))
-LOGS				=	$(patsubst $(DIR_DATA_TEST)/%.cfg,$(DIR_LOG)/%.log,$(wildcard $(DIR_DATA_TEST)/*.cfg))
-BENCHS				=	$(patsubst $(DIR_DATA_BENCH)/%.cfg,$(DIR_LOG)/%.log,$(wildcard $(DIR_DATA_BENCH)/*.cfg))
-DEBUG_CFG			=	$(DIR_DATA_TEST)/debug.cfg
-DEBUG_LOG			=	$(DIR_LOG)/debug.log
-
+LOGS				=	$(patsubst $(DIR_DATA)/%.cfg,$(DIR_LOG)/%.log,$(wildcard $(DIR_DATA)/$(DATA)/*.cfg))
 EXEC				=	$(DIR_BIN)/soft.x
-EXEC_PREFIX			=	
+EXEC_PREFIX			=	$(NICE) -n $(PRIORITY)
 #$(VALGRIND)
 
 #-----[ Compilation ]--------------------------------------
-INCDIR				=	$(SYSTEMC_INCDIR_$(SIMULATOR))		\
+INCDIR				=	$(SYSTEMC_INCDIR_$(SIMULATOR_SYSTEMC))		\
 					$(MORPHEO_INCDIR)			\
 					$(ENVIRONMENT_INCDIR)			\
 					-I$(DIR_INC)                          
 
-#LIBDIR				=	$(SYSTEMC_LIBDIR_$(SIMULATOR))		\
+#LIBDIR				=	$(SYSTEMC_LIBDIR_$(SIMULATOR_SYSTEMC))		\
 #					$(ENVIRONMENT_LIBDIR)			\
 #					$(MORPHEO_LIBDIR)			
 
 # FIXME !!!
-LIBDIR				=	$(SYSTEMC_LIBDIR_$(SIMULATOR))		\
+LIBDIR				=	$(SYSTEMC_LIBDIR_$(SIMULATOR_SYSTEMC))		\
 					-L$(DIR_LIB)
 
 LIBNAME				=	$(ENVIRONMENT_LIBNAME)			\
 					$(MORPHEO_LIBNAME)			\
-					$(SYSTEMC_LIBNAME_$(SIMULATOR))
-
-FLAGS				=	$(SYSTEMC_CFLAGS_$(SIMULATOR))
+					$(SYSTEMC_LIBNAME_$(SIMULATOR_SYSTEMC))
+
+FLAGS				=	$(SYSTEMC_CFLAGS_$(SIMULATOR_SYSTEMC))
 
 PLATFORMS_CXX_FLAGS		=	$(MORPHEO_FLAGS) $(CXX_FLAGS) $(FLAGS) $(INCDIR)
@@ -101,5 +106,5 @@
 vpath	%.cpp	$(DIR_SRC)
 vpath	%.o	$(DIR_OBJ)
-vpath	%.cfg	$(DIR_DATA_TEST) $(DIR_DATA_BENCH)
+vpath	%.cfg	$(DIR_DATA)/*/
 
 .PRECIOUS			: $(DIR_OBJ)/%.o $(DIR_BIN)/%.x $(DIR_LOG)/%.log
@@ -110,5 +115,5 @@
 				@\
 				$(ECHO) "Linkage            : $*";\
-				case "${SIMULATOR}" in								\
+				case "${SIMULATOR_SYSTEMC}" in								\
 				    "modelsim")									\
 					$(MAKE) $(WORK_NAME);							\
@@ -127,13 +132,11 @@
 				esac;										\
 
-
-test				: $(DIR_LOG) all
-				@\
-				declare logs;						\
-				if $(TEST) -f "$(DEBUG_CFG)"; then			\
-					logs="$(DEBUG_LOG)";				\
-				else							\
-					logs="$(LOGS)";					\
+run 				: all
+				@\
+				if $(TEST) "$(DATA)" != "$(DATA_ALL)"; then		\
+					$(RM) $(DIR_LOG)/$(DATA);			\
 				fi;							\
+				$(MAKE) $(DIR_LOGS);					\
+				declare logs="$(LOGS)";					\
 				$(MAKE) $$logs;						\
 				declare -i nb_test=0;					\
@@ -154,19 +157,20 @@
 				fi;
 
-bench				: $(DIR_LOG) all
-				@\
-				declare logs="$(BENCHS)";				\
-				$(MAKE) $$logs;
-
-execute				: bench
-
-#				$(ECHO) $${data} | $(EXEC_PREFIX) $(EXEC) &> $$log;	\
-
-$(DIR_LOG)/%.log		: %.cfg
+execute				: run
+
+debug				:
+				@\
+				$(MAKE) run DATA=debug;
+
+bench				:
+				@\
+				$(MAKE) run DATA=bench;
+
+$(DIR_LOG)/%.log 		: $(DIR_DATA)/%.cfg
 				@\
 				file=$$($(BASENAME) $<);				\
 				data=$$($(CAT) $<);					\
 				log=$@;							\
-				$(ECHO) "Run                : $$file";			\
+				$(ECHO) "Run                : $*";			\
 				$(EXEC_PREFIX) $(EXEC) $${data} &> $$log;		\
 				$(GREP) -q "Test OK" $$log; 				\
@@ -176,7 +180,9 @@
                                 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";	\
+				then test="... OK    ";					\
+				else test="... KO !!!";					\
 				fi;							\
+				$(ECHO) -e "                     $* $${test}\t$${timing}";\
+                                echo "{$$($(date))} $* $${test} $${timing}" >> $$($(DIRNAME) $*).res;\
 
 #-----[ Library + Software ]-------------------------------
@@ -198,5 +204,5 @@
 				$(CXX) $(PLATFORMS_CXX_FLAGS) -c -o $@ $<;
 
-$(DIR_OBJ) $(DIR_BIN) $(DIR_LOG) :
+$(DIR_OBJ) $(DIR_BIN) $(DIR_LOGS) :
 				@\
 				$(ECHO) "Create directory   : $@";\
@@ -208,6 +214,6 @@
 				@\
 				$(ECHO) "Delete     temporary files in directory $(PWD)";\
-				$(RM) 	$(OBJECTS) $(EXEC) \
-					*~ $(DIR_SRC)/*~ $(DIR_INC)/*~ $(DIR_DATA_TEST)/*~ $(DIR_DATA_BENCH)/*~ \
+				$(RM) 	$(OBJECTS) $(EXEC) $(LOGS) \
+					*~ $(DIR_SRC)/*~ $(DIR_INC)/*~ $(DIR_DATA)/*/*~ *.res *.txt\
 					*core* \
 					tty* \
@@ -232,9 +238,13 @@
 				$(ECHO) "";\
 				$(ECHO) " * all (default rules) : create software";\
-				$(ECHO) " * test                : execute platforms with test configuration";\
-				$(ECHO) " * bench               : execute platforms with bench configuration";\
+				$(ECHO) " * run                 : execute platforms with test configuration";\
+				$(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) " * execute             : cf 'make run'";\
+				$(ECHO) " * debug               : cf 'make run DATA=debug'";\
+				$(ECHO) " * bench               : cf 'make run DATA=bench'";\
 				$(ECHO) " * lib                 : make library";\
 				$(ECHO) " * soft                : make software";\
-				$(ECHO) " * execute             : cf 'make bench'";\
 				$(ECHO) " * clean               : erase temporary files";\
 				$(ECHO) " * clean_all           : erase generated files";\