GitLab

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

a62ce115

by Andreas Klebinger at 2025-09-19T18:26:18-04:00

Tweak jspace test

I've given it a longer timeout, and tweaked the test file generation
to speed it up a bit. Hopefully that is enough to make it constentily pass.

Last but not least it now also always uses three threads.

3 changed files:

testsuite/tests/driver/j-space/Makefile
testsuite/tests/driver/j-space/all.T
testsuite/tests/driver/j-space/genJspace

Changes:

testsuite/tests/driver/j-space/Makefile

@@ -5,5 +5,5 @@ include $(TOP)/mk/test.mk
  jspace:
  	./genJspace
  	"$(TEST_HC)" $(TEST_HC_OPTS) -Wall -Werror -v0 jspace.hs -rtsopts -package ghc -threaded
 -	./jspace$(exeext) +RTS -N -hT --no-automatic-heap-samples -RTS "`'$(TEST_HC)' --print-libdir | tr -d '\r'`"
 +	./jspace$(exeext) +RTS -N3 -qn2 -hT --no-automatic-heap-samples -RTS "`'$(TEST_HC)' --print-libdir | tr -d '\r'`"

testsuite/tests/driver/j-space/all.T

 -test('jspace', [extra_files(['genJspace']), req_target_smp, req_ghc_smp, js_broken(22573)], makefile_test, ['jspace'])
 +# For slightly unclear reasons this test sometimes performs terribly on arm.
 +# For the moment we simply give it a slightly higher timeout to address this.
 +test('jspace', [extra_files(['genJspace']), req_target_smp, req_ghc_smp, js_broken(22573)
 +               , run_timeout_multiplier(2) ], makefile_test, ['jspace'])

testsuite/tests/driver/j-space/genJspace

@@ -9,25 +9,22 @@ DEPTH=8
  WIDTH=40
  echo "module JSpaceTest where" > JSpaceTest.hs
  echo "module W where" > W.hs
 -  for j in $(seq -w 1 300); do
 -    echo "w$j = 123" >> W.hs;
 -  done
++
 +awk -v len="10" 'BEGIN {for (i=1;i<=len;i++) print "w"i" = 123"}' >> W.hs
++
  for i in $(seq -w 1 $WIDTH); do
    echo "module W$i where" > W$i.hs;
    echo "import W" >> W$i.hs;
    echo "import W$i" >> JSpaceTest.hs;
 -  for j in $(seq -w 1 1000); do
 -    echo "w$j = 123" >> W$i.hs;
 -  done
 +  awk -v len="1000" 'BEGIN {for (i=1;i<=len;i++) print "w"i" = 123"}' >> W$i.hs;
  done
++
  echo "module H0 where" > H0.hs;
  echo "import {-# SOURCE #-} H$DEPTH" >> H0.hs;
  echo "import H$DEPTH" >> JSpaceTest.hs;
  for i in $(seq -w 1 $DEPTH); do
    echo "module H$i where" > H$i.hs;
    echo "import H$((i-1))" >> H$i.hs;
 -  for j in $(seq -w 1 100); do
 -    echo "h$j = 123" >> H$i.hs;
 -  done
 +  awk -v len="100" 'BEGIN {for (i=1;i<=len;i++) print "h"i" = 123"}' >> H$i.hs;
  done
  echo "module H$DEPTH where" > H$DEPTH.hs-boot;