Diff

Differences From Artifact [df35486eb4]:

To Artifact [b787f2bb27]:


   493    493   		## Clean tests log
   494    494   		rm -f "${testresultslog}"
   495    495   		for testscp in "${TESTDIR}"/tests/*.tcl; do
   496    496   			testscp_tag="$(basename "${testscp}" .tcl)"
   497    497   			testscppre="$(dirname "${testscp}")/${testscp_tag}.sh"
   498    498   			scplogfile="${outputname}-${testscp_tag}.log"
   499    499   
   500         -			# If a command is required to start the kit, prepare to kill it
   501         -			# in case of timeout.
   502         -			## Temporarily disabled since currently it is causing
   503         -			## more problems in the form of tests being killed
   504         -			## prematurely than we are having issues with tests
   505         -			## hanging
   506         -			kitrunkillpid=""
   507         -			if [ "1" = "0" -a -n "${kitruncmd}" ]; then
   508         -				(
   509         -					sleep 120
   510         -					killall "$(basename "${outputname}")" >/dev/null 2>/dev/null
   511         -				) >/dev/null 2>/dev/null &
   512         -				kitrunkillpid="$!"
   513         -			fi
   514         -
   515    500   			(
   516    501   				if [ -f "${testscppre}" ]; then
   517    502   					. "${testscppre}"
   518    503   				fi
   519    504   
   520    505   				if [ "${kitdll}" = "1" ]; then
   521         -					${kitruncmd} "${outputname}-tclsh" "${testscp}" "${outputname}" "${kit}" "${version}"
          506  +					timeout -k 10 600 ${kitruncmd} "${outputname}-tclsh" "${testscp}" "${outputname}" "${kit}" "${version}"
   522    507   				else
   523         -					${kitruncmd} "${outputname}" "${testscp}" "${outputname}" "${kit}" "${version}"
          508  +					timeout -k 10 600 ${kitruncmd} "${outputname}" "${testscp}" "${outputname}" "${kit}" "${version}"
   524    509   				fi
   525    510   			) > "${scplogfile}" 2>&1
   526    511   
   527    512   			if [ "$?" != "0" ]; then
   528    513   				echo "Script failed: ${testscp_tag} on ${version}/${kit}" >&2
   529    514   
   530    515   				failed="${failed} ${version}/${kit}-test-${testscp_tag}"
   531    516   
   532    517   				echo "${testscp_tag}: FAIL" >>  "${testresultslog}"
   533    518   
   534    519   				continue
   535    520   			fi
   536    521   
   537         -			# Kill the watchdog for this iteration
   538         -			if [ -n "${kitrunkillpid}" ]; then
   539         -				kill -9 "${kitrunkillpid}" >/dev/null 2>/dev/null
   540         -			fi
   541         -
   542    522   			echo "${testscp_tag}: PASS" >>  "${testresultslog}"
   543    523   
   544    524   			rm -f "${scplogfile}"
   545    525   		done
   546    526   
   547    527   		if [ -f "${outputname}-origname" ]; then
   548    528   			rm -f "${createdkit}"