Add explicit ports

ODIN_II/exec_wrapper.sh

@@ -23,6 +23,8 @@ PERF_EXEC="perf stat record -a -d -d -d -o"
 GDB_EXEC="gdb --args"
 EXEC_PREFIX=""
 
+TOOL_LIST=""
+
 TEST_NAME="N/A"
 LOG=""
 LOG_FILE=""
@@ -98,6 +100,7 @@ Usage: ./exec_wrapper.sh [options] <path/to/arguments.file>
 			--time_limit                                * stops Odin after X seconds
 			--limit_ressource				            * limit ressource usage using ulimit -m (25% of hrdw memory) and nice value of 19
 			--verbosity [0, 1, 2]						* [0] no output, [1] output on error, [2] output the log to stdout
+			--no_color                                  * force no color on output
 "
 }
 
@@ -213,6 +216,12 @@ then
 	_exit_with_code "-1"
 fi
 
+if [[ -t 1 ]] && [[ -t 2 ]] && [[ ! -p /dev/stdout ]] && [[ ! -p /dev/stderr ]]
+then
+	COLORIZE_OUTPUT="on"
+	log_it "Using colorized output\n"
+fi
+
 while [[ "$#" > 0 ]]
 do 
 	case $1 in
@@ -242,6 +251,10 @@ do
 			RESTRICT_RESSOURCE="on" 
 			;;
 
+		--no_color)
+			COLORIZE_OUTPUT="off"
+			;;
+
 		--verbosity)
 			case "_$2" in
 				_0)	VERBOSE="0";;
@@ -267,14 +280,17 @@ do
 			else
 				case $2 in
 					valgrind)
+						TOOL_LIST="valgrind ${TOOL_LIST}"
 						EXEC_PREFIX="${VALGRIND_EXEC} ${EXEC_PREFIX}"
 						;;
 					gdb)
+						TOOL_LIST="gdb ${TOOL_LIST}"
 						USE_TIMEOUT="off"
 						USE_LOGS="off"
 						EXEC_PREFIX="${GDB_EXEC} ${EXEC_PREFIX}"
 						;;
 					perf)
+						TOOL_LIST="perf ${TOOL_LIST}"
 						EXEC_PREFIX="${PERF_EXEC} ${EXEC_PREFIX}"
 						shift
 						;;
@@ -302,13 +318,6 @@ then
 	restrict_ressource
 fi
 
-
-if [[ -t 1 ]] && [[ -t 2 ]] && [[ ! -p /dev/stdout ]] && [[ ! -p /dev/stderr ]]
-then
-	COLORIZE_OUTPUT="on"
-	log_it "Using colorized output\n"
-fi
-
 if [ "${USE_LOGS}" == "on" ]
 then
 	if [ "_${LOG_FILE}" == "_" ]
@@ -331,12 +340,14 @@ fi
 
 if [ "${USE_TIME}" == "on" ]
 then
+	TOOL_LIST="time ${TOOL_LIST}"
 	EXEC_PREFIX="${TIME_EXEC} --output=${LOG_FILE} --append ${EXEC_PREFIX}"
 	log_it "running with /bin/time\n"
 fi
 
 if [ "${USE_TIMEOUT}" == "on" ]
 then
+	TOOL_LIST="timeout ${TOOL_LIST}"
 	EXEC_PREFIX="timeout ${TIME_LIMIT} ${EXEC_PREFIX}"
 	log_it "running with timeout ${TIME_LIMIT}\n"
 fi
@@ -352,23 +363,52 @@ then
 	log_it "Must define a path to a valid argument file"
 	dump_log
 else
-	_ARGS=$(cat ${ARG_FILE})
-	if [ "${USE_LOGS}" == "on" ]
+	failed_requirements=""
+	# test all necessary tool
+	for tool_used in ${TOOL_LIST}
+	do
+		which ${tool_used} &> /dev/null
+		if [ "$?" != "0" ]; 
+		then
+			failed_requirements="${tool_used} ${failed_requirements}"
+		fi
+	done
+
+	if [ "_${failed_requirements}" != "_" ];
 	then
-		if [ "${VERBOSE}" == "2" ]
+		if [ "${USE_LOGS}" == "on" ]
 		then
-			${EXEC_PREFIX} ${_ARGS} 2>&1 | tee ${LOG_FILE}
+			if [ "${VERBOSE}" == "2" ]
+			then
+				echo "missing \"${failed_requirements}\"" | tee ${LOG_FILE}
+			else
+				echo "missing \"${failed_requirements}\"" &>> ${LOG_FILE}
+			fi	
 		else
-			${EXEC_PREFIX} ${_ARGS} &>> ${LOG_FILE}
+			echo "missing \"${failed_requirements}\""
 		fi
+
+		EXIT_CODE="-1"
+		pretty_print_status "Missing package: ${failed_requirements}"
+
 	else
-		${EXEC_PREFIX} ${_ARGS}
+		_ARGS=$(cat ${ARG_FILE})
+		if [ "${USE_LOGS}" == "on" ]
+		then
+			if [ "${VERBOSE}" == "2" ]
+			then
+				${EXEC_PREFIX} ${_ARGS} 2>&1 | tee ${LOG_FILE}
+			else
+				${EXEC_PREFIX} ${_ARGS} &>> ${LOG_FILE}
+			fi
+		else
+			${EXEC_PREFIX} ${_ARGS}
+		fi
+		EXIT_CODE=$?
+		display "${EXIT_CODE}"
 	fi
-	EXIT_CODE=$?
 fi
 
-display "${EXIT_CODE}"
-
 EXIT_STATUS=0
 if [ "${EXIT_CODE}" != "0" ]
 then

ODIN_II/regression_test/.library/output_on_error.conf

@@ -1,2 +1,2 @@
-script_synthesis_params=--verbosity 1
-script_simulation_params=--verbosity 1
+script_synthesis_params=--verbosity 1 --no_color
+script_simulation_params=--verbosity 1 --no_color