Skip to contentSkip to conversation

expat: Simplify ptest-runner

PATCH New Richard Purdie 1 participant 1 message Jan 18, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 expat: Simplify ptest-runner

Upstream mentioned our ptest-runner could likely be simplified. I had a look at the output and yes, most of the code in the runner is now obsolete as upstream output is compatible with what we need. Simplify accordingly.

---
 meta/recipes-core/expat/expat/run-ptest | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)
meta/recipes-core/expat/expat/run-ptest +4 -18
index 59d8ab57e38..dbf602ca800 100644
@@ -1,23 +1,9 @@
 #!/bin/bash
 
-output=${1:-"expat_tests.log"} # default log file
-
-# logging function
-function testCheck() {
-	testExec="$1"
-	shift
-	echo && echo ${testExec} && ./${testExec} "$@"
-	error=$?
-	result=$([[ ${error} -eq 0 ]] && echo "PASS" || echo "FAIL")
-	echo "${result}: ${testExec}" && echo "============================"
-}
-
-export output
-export -f testCheck
 TIME=$(which time)
 
-echo "Architecture: $(uname -m)" > ${output}
-echo "Image: $(uname -sr)" >> ${output}
-${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -v" |& tee -a ${output}
-${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -v" |& tee -a ${output}
+echo "runtests"
+${TIME} -f 'Execution time: %e s' bash -c "./runtests -v"
+echo "runtestspp"
+${TIME} -f 'Execution time: %e s' bash -c "./runtestspp -v"
 echo
Signature · 1 line
2.32.0