[v2] Format gotools.sum closer to what DejaGnu does

Message ID 20231103125401.3238220-1-maxim.kuvyrkov@linaro.org
State New
Headers
Series [v2] Format gotools.sum closer to what DejaGnu does |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Testing passed

Commit Message

Maxim Kuvyrkov Nov. 3, 2023, 12:54 p.m. UTC
  The only difference compared to v1 is using vanilla automake 1.15.1
to regenerate Makefile.in.

I'll merge this as obvious if no-one objects in a day.

===
... to restore compatability with validate_failures.py .
The testsuite script validate_failures.py expects
"Running <sub-testsuite> ..." to extract <sub-testsuite> values,
and gotools.sum provided "Running <sub-testsuite>".

Note that libgo.sum, which also uses Makefile logic to generate
DejaGnu-like output, already has "..." suffix.

gotools/ChangeLog:

	* Makefile.am: Update "Running <sub-testsuite> ..." output
	* Makefile.in: Regenerate.

Signed-off-by: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
---
 gotools/Makefile.am | 4 ++--
 gotools/Makefile.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
  

Comments

Jeff Law Nov. 3, 2023, 1:38 p.m. UTC | #1
On 11/3/23 06:54, Maxim Kuvyrkov wrote:
> The only difference compared to v1 is using vanilla automake 1.15.1
> to regenerate Makefile.in.
> 
> I'll merge this as obvious if no-one objects in a day.
> 
> ===
> ... to restore compatability with validate_failures.py .
> The testsuite script validate_failures.py expects
> "Running <sub-testsuite> ..." to extract <sub-testsuite> values,
> and gotools.sum provided "Running <sub-testsuite>".
> 
> Note that libgo.sum, which also uses Makefile logic to generate
> DejaGnu-like output, already has "..." suffix.
> 
> gotools/ChangeLog:
> 
> 	* Makefile.am: Update "Running <sub-testsuite> ..." output
> 	* Makefile.in: Regenerate.
OK.  Thanks for running down the differences in the autogenerated  bits.

Jeff
  
Bernhard Reutner-Fischer Nov. 3, 2023, 7:54 p.m. UTC | #2
On 3 November 2023 14:38:06 CET, Jeff Law <jeffreyalaw@gmail.com> wrote:
>
>
>On 11/3/23 06:54, Maxim Kuvyrkov wrote:

>> gotools/ChangeLog:
>> 
>> 	* Makefile.am: Update "Running <sub-testsuite> ..." output
>> 	* Makefile.in: Regenerate.
>OK.  Thanks for running down the differences in the autogenerated  bits.

Many thanks for reinstating regression checking even for go stuff and hence the extra 2 or 3 kilometres to fix unnoticed regressions imposed by different dejagnu check files/suites and the wart of using pristine autotools infrastructure.

cheers
  

Patch

diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 7b5302990f8..d2376b9c25b 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -332,8 +332,8 @@  check: check-head check-go-tool check-runtime check-cgo-test check-carchive-test
 	@cp gotools.sum gotools.log
 	@for file in cmd_go-testlog runtime-testlog cgo-testlog carchive-testlog cmd_vet-testlog embed-testlog; do \
 	  testname=`echo $${file} | sed -e 's/-testlog//' -e 's|_|/|'`; \
-	  echo "Running $${testname}" >> gotools.sum; \
-	  echo "Running $${testname}" >> gotools.log; \
+	  echo "Running $${testname} ..." >> gotools.sum; \
+	  echo "Running $${testname} ..." >> gotools.log; \
 	  sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' < $${file} >> gotools.log; \
 	  grep '^--- ' $${file} | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' -e 's/SKIP/UNTESTED/' | sort -k 2 >> gotools.sum; \
 	done
diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index 2783b91ef4b..36c2ec2abd3 100644
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -1003,8 +1003,8 @@  mostlyclean-local:
 @NATIVE_TRUE@	@cp gotools.sum gotools.log
 @NATIVE_TRUE@	@for file in cmd_go-testlog runtime-testlog cgo-testlog carchive-testlog cmd_vet-testlog embed-testlog; do \
 @NATIVE_TRUE@	  testname=`echo $${file} | sed -e 's/-testlog//' -e 's|_|/|'`; \
-@NATIVE_TRUE@	  echo "Running $${testname}" >> gotools.sum; \
-@NATIVE_TRUE@	  echo "Running $${testname}" >> gotools.log; \
+@NATIVE_TRUE@	  echo "Running $${testname} ..." >> gotools.sum; \
+@NATIVE_TRUE@	  echo "Running $${testname} ..." >> gotools.log; \
 @NATIVE_TRUE@	  sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' < $${file} >> gotools.log; \
 @NATIVE_TRUE@	  grep '^--- ' $${file} | sed -e 's/^--- \(.*\) ([^)]*)$$/\1/' -e 's/SKIP/UNTESTED/' | sort -k 2 >> gotools.sum; \
 @NATIVE_TRUE@	done