Commit 85ddb69a authored by berge's avatar berge
Browse files

Changed logFormat regex to reflect framework document 

Changed Pixit regex (PXT => PX) to remain coherent with LibCommon
Changed component timer regex to reflect framework document
parent 47df4b2f

t3q/t3q_ITS.xml

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
      <checkLogItemFormat>true</checkLogItemFormat>

      <checkLogStatementFormat>true</checkLogStatementFormat>

      <processSubsequentLogStatementsAsOne>true</processSubsequentLogStatementsAsOne>

      <logFormatRegExp>[\*]{4}\s([fta]_[a-zA-Z0-9]+?):\s(INFO|WARNING|ERROR|PASS|FAIL|INCONC|TIMEOUT):\s.*?[\*]{4}</logFormatRegExp>

      <logFormatRegExp>[\*]{3}\s([fta]_[a-zA-Z0-9_]+?):\s(INFO|WARNING|ERROR|PASS|FAIL|INCONC|TIMEOUT):\s.*?[\*]{3}</logFormatRegExp>

      <checkExternalFunctionInvocationPrecededByLogStatement>true</checkExternalFunctionInvocationPrecededByLogStatement>

      <checkInconcOrFailSetVerdictPrecededByLog>true</checkInconcOrFailSetVerdictPrecededByLog>

      <checkNoLabelsOrGotoStatements>true</checkNoLabelsOrGotoStatements>
@@ -92,8 +92,8 @@ 
        <variableRegExp>v_(([a-z]+[0-9]*)|[0-9]+)([A-Z](([a-z]+[0-9]*)|[0-9]+))*</variableRegExp>

        <componentVariableRegExp>vc_(([a-z]+[0-9]*)|[0-9]+)([A-Z](([a-z]+[0-9]*)|[0-9]+))*</componentVariableRegExp>

        <timerRegExp>t_(([a-z]+[0-9]*)|[0-9]+)([A-Z](([a-z]+[0-9]*)|[0-9]+))*</timerRegExp>

        <componentTimerRegExp>t_(([a-z]+[0-9]*)|[0-9]+)([A-Z](([a-z]+[0-9]*)|[0-9]+))*</componentTimerRegExp>

        <moduleParameterRegExp>(PICS|PXT)(_[A-Z0-9]+)+</moduleParameterRegExp>

        <componentTimerRegExp>tc_(([a-z]+[0-9]*)|[0-9]+)([A-Z](([a-z]+[0-9]*)|[0-9]+))*</componentTimerRegExp>

        <moduleParameterRegExp>(PICS|PX)(_[A-Z0-9]+)+</moduleParameterRegExp>

        <formalParameterRegExp>p_(([a-z]+[0-9]*)|[0-9]+)([A-Z](([a-z]+[0-9]*)|[0-9]+))*</formalParameterRegExp>

        <enumeratedValueRegExp>e_(([a-z]+[0-9]*)|([0-9]+(h|min|ms|s|us|cm|m|km)?))([A-Z](([a-z]+[0-9]*)|[0-9]+))*</enumeratedValueRegExp>

      </namingConventionsConfig>