diff --git a/cmake/scripts/Regression.cmake b/cmake/scripts/Regression.cmake index af5471799f..e8c3c0b5a2 100644 --- a/cmake/scripts/Regression.cmake +++ b/cmake/scripts/Regression.cmake @@ -63,11 +63,10 @@ string(REGEX REPLACE "\\\[[0-9-]+ [0-9:]+\\\] " "" REGRESSION_RESULT "${REGRESSI string(REGEX REPLACE "\\\[script:[0-9]\\\]" "" REGRESSION_RESULT "${REGRESSION_RESULT}") # Convert the output to a format that is expected (and more readable) by result.txt -string(REPLACE "\ndbg: " "\n" REGRESSION_RESULT "${REGRESSION_RESULT}") -string(REPLACE "\n " "\nERROR: " REGRESSION_RESULT "${REGRESSION_RESULT}") -string(REPLACE "\nERROR: [1] " "\n" REGRESSION_RESULT "${REGRESSION_RESULT}") -string(REPLACE "\n[P] " "\n" REGRESSION_RESULT "${REGRESSION_RESULT}") -string(REPLACE "\n[S] " "\n" REGRESSION_RESULT "${REGRESSION_RESULT}") +string(REPLACE "dbg: " "ERROR: " REGRESSION_RESULT "${REGRESSION_RESULT}") +string(REPLACE "ERROR: [1] " "" REGRESSION_RESULT "${REGRESSION_RESULT}") +string(REPLACE "[P] " "" REGRESSION_RESULT "${REGRESSION_RESULT}") +string(REPLACE "[S] " "" REGRESSION_RESULT "${REGRESSION_RESULT}") string(REGEX REPLACE "dbg: ([^\n]*)\n?" "" REGRESSION_RESULT "${REGRESSION_RESULT}") # Remove duplicate script info diff --git a/regression/regression/result.txt b/regression/regression/result.txt index 2119ada528..370d7cb775 100644 --- a/regression/regression/result.txt +++ b/regression/regression/result.txt @@ -1,3 +1,4 @@ + --TestInit-- Ops: 9988 TickTest: 1 diff --git a/regression/stationlist/result.txt b/regression/stationlist/result.txt index c04a306358..20e594766f 100644 --- a/regression/stationlist/result.txt +++ b/regression/stationlist/result.txt @@ -1,3 +1,4 @@ + --StationList-- Count(): 5 Location ListDump: