gawk: improve randtest stability
PATCH 1/1 gawk: improve randtest stability
Backport upstream fix to improve stability of randtest.sh by retrying when sigma is too small, avoiding intermittent failures.
[YOCTO #16254]
--- .../gawk/files/randtest-fix.patch | 136 ++++++++++++++++++ meta/recipes-extended/gawk/gawk_5.4.0.bb | 1 + 2 files changed, 137 insertions(+) create mode 100644 meta/recipes-extended/gawk/files/randtest-fix.patch
meta/recipes-extended/gawk/files/randtest-fix.patch new file +136 -0
@@ -0,0 +1,136 @@ +From f2250f4bc864913437619af7a9834a1c24915acd Mon Sep 17 00:00:00 2001 +From: "Arnold D. Robbins" <[email protected]> +Date: Thu, 28 May 2026 09:52:41 -0400 +Subject: Improve test/randtest.sh. + +Upstream-Status: Backport +https://cgit.git.savannah.gnu.org/cgit/gawk.git/commit/?id=f2250f4bc864913437619af7a9834a1c24915acd + +--- + +diff --git a/test/randtest.sh b/test/randtest.sh +index 597376a8..6ae6f830 100755 +--- a/test/randtest.sh ++++ b/test/randtest.sh +@@ -45,68 +45,77 @@ $AWK 'BEGIN{ + nsamples=('$NSAMPLES'); + max_allowed_sigma=('$MAX_ALLOWED_SIGMA'); + nruns=('$NRUNS'); +- for(tau=0;tau<nsamples/2;tau++) corr[tau]=0; ++ max_retries=5 + +- for(run=0;run<nruns;run++) { +- sum=0; ++ for (retry=0; retry<max_retries; retry++) { ++ for(tau=0; tau<nsamples/2; tau++) corr[tau]=0; + +- # Fill an array with a sequence of samples that are a +- # function of pairs of rand() values. ++ for(run=0; run<nruns; run++) { ++ sum=0; + +- for(i=0;i<nsamples;i++) { +- samp[i]=((rand()-0.5)*(rand()-0.5))^2; +- sum=sum+samp[i]; +- } ++ # Fill an array with a sequence of samples that are a ++ # function of pairs of rand() values. + +- # Subtract off the mean of the sequence: ++ for(i=0; i<nsamples; i++) { ++ samp[i]=((rand()-0.5)*(rand()-0.5))^2; ++ sum=sum+samp[i]; ++ } + +- mean=sum/nsamples; +- for(i=0;i<nsamples;i++) samp[i]=samp[i]-mean; ++ # Subtract off the mean of the sequence: + +- # Calculate an autocorrelation function on the sequence. +- # Because the values of rand() should be independent, there +- # should be no peaks in the autocorrelation. ++ mean=sum/nsamples; ++ for(i=0;i<nsamples;i++) samp[i]=samp[i]-mean; + +- for(tau=0;tau<nsamples/2;tau++) { +- sum=0; +- for(i=0;i<nsamples/2;i++) sum=sum+samp[i]*samp[i+tau]; +- corr[tau]=corr[tau]+sum; +- } ++ # Calculate an autocorrelation function on the sequence. ++ # Because the values of rand() should be independent, there ++ # should be no peaks in the autocorrelation. + +- } +- # Normalize the autocorrelation to the tau=0 value. ++ for(tau=0; tau<nsamples/2; tau++) { ++ sum=0; ++ for(i=0;i<nsamples/2;i++) sum=sum+samp[i]*samp[i+tau]; ++ corr[tau]=corr[tau]+sum; ++ } + +- max_corr=corr[0]; +- for(tau=0;tau<nsamples/2;tau++) corr[tau]=corr[tau]/max_corr; ++ } ++ # Normalize the autocorrelation to the tau=0 value. + +- # OPTIONALLY Print out the autocorrelation values: ++ max_corr=corr[0]; ++ for(tau=0;tau<nsamples/2;tau++) corr[tau]=corr[tau]/max_corr; + +- # for(tau=0;tau<nsamples/2;tau++) print tau, corr[tau] > "pairpower_corr.data"; ++ # OPTIONALLY Print out the autocorrelation values: + +- # Calculate the sigma for the non-zero tau values: ++ # for(tau=0;tau<nsamples/2;tau++) print tau, corr[tau] > "pairpower_corr.data"; + +- power_sum=0; ++ # Calculate the sigma for the non-zero tau values: + +- for(tau=1;tau<nsamples/2;tau++) power_sum=power_sum+(corr[tau])^2; ++ power_sum=0; + +- sigma=sqrt(power_sum/(nsamples/2-1)); ++ for(tau=1;tau<nsamples/2;tau++) power_sum=power_sum+(corr[tau])^2; + +- # See if any of the correlations exceed a reasonable number of sigma: ++ sigma=sqrt(power_sum/(nsamples/2-1)); + +- passed=1; +- for(tau=1;tau<nsamples/2;tau++) { +- if ( abs(corr[tau])/sigma > max_allowed_sigma ) { +- print "Tau=", tau ", Autocorr=", corr[tau]/sigma, "sigma"; +- passed=0; +- } ++ if (sigma < 1e-6) { ++ print "Sigma too small, retrying run", retry ++ continue + } +- if(!passed) { +- print "Test failed." +- exit(1); ++ ++ # See if any of the correlations exceed a reasonable number of sigma: ++ ++ for(tau=1;tau<nsamples/2;tau++) { ++ if (abs(corr[tau])/sigma > max_allowed_sigma) { ++ print "Tau=", tau ", Autocorr=", corr[tau]/sigma, "sigma"; ++ print "Test failed." ++ exit 1 ++ } + } +- else exit (0); ++ ++ exit 0 + } + ++ print "Test failed after retries due to unstable sigma" ++ exit 1 ++} ++ + function abs(abs_input) { return(sqrt(abs_input^2)) ; } + ' + +-- +2.34.1 +
meta/recipes-extended/gawk/gawk_5.4.0.bb +1 -0
@@ -28,6 +28,7 @@ PACKAGECONFIG[pma-if-64bit] = "--enable-pma,--disable-pma, " SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.xz \ file://run-ptest \ file://0001-configure.ac-re-enable-disabled-printf-features.patch \ + file://randtest-fix.patch \ " SRC_URI[sha256sum] = "3dd430f0cd3b4428c6c3f6afc021b9cd3c1f8c93f7a688dc268ca428a90b4ac1"
Signature · 1 line
2.34.1
Patchtest results for [PATCH] gawk: improve randtest stability
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:
---
Testing patch /home/patchtest/share/mboxes/gawk-improve-randtest-stability.patch
FAIL: test Signed-off-by presence: A patch file has been added without a Signed-off-by tag: 'randtest-fix.patch' (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test bugzilla entry format (test_mbox.TestMbox.test_bugzilla_entry_format)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!