Rework delay logic in various tests to be consistent.

fixes #582

Author: paolopas

test/core_option_l.py

@@ -2,43 +2,29 @@
 
 # Copyright 2007 Rene Rivera.
 # Copyright 2011 Steven Watanabe
+# Copyright 2026 Paolo Pastori
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE.txt or copy at
 # https://www.bfgroup.xyz/b2/LICENSE.txt)
 
 import BoostBuild
+import sys
 
-t = BoostBuild.Tester(pass_toolset=0)
+sleep_s = 1.5
 
-t.write("sleep.bat", """\
-::@timeout /T %1 /NOBREAK >nul
-@ping 127.0.0.1 -n 2 -w 1000 >nul
-@ping 127.0.0.1 -n %1 -w 1000 >nul
-@exit /B 0
-""")
+t = BoostBuild.Tester(pass_toolset=False)
 
 t.write("file.jam", """\
-if $(NT)
-{
-    SLEEP = @call sleep.bat ;
-}
-else
-{
-    SLEEP = sleep ;
-}
-
-actions .a. {
-echo 001
-$(SLEEP) 4
-echo 002
-}
+actions .a. {{
+"{}" -c "import time; time.sleep({})"
+}}
 
 .a. sleeper ;
 
 DEPENDS all : sleeper ;
-""")
+""".format(sys.executable, sleep_s))
 
-t.run_build_system(["-ffile.jam", "-d1", "-l2"], status=1)
-t.expect_output_lines("2 second time limit exceeded")
+t.run_build_system(["-ffile.jam", "-l1"], status=1)
+t.expect_output_lines("1 second time limit exceeded")
 
 t.cleanup()

test/core_parallel_actions.py

@@ -2,64 +2,49 @@
 
 # Copyright 2006 Rene Rivera.
 # Copyright 2011 Steven Watanabe
+# Copyright 2026 Paolo Pastori
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
 
 import BoostBuild
+import sys
 
-t = BoostBuild.Tester(["-d1"], pass_toolset=0)
-
-t.write("sleep.bat", """\
-::@timeout /T %1 /NOBREAK >nul
-@ping 127.0.0.1 -n 2 -w 1000 >nul
-@ping 127.0.0.1 -n %1 -w 1000 >nul
-@exit /B 0
-""")
+t = BoostBuild.Tester(["-d1"], pass_toolset=False)
 
 t.write("file.jam", """\
-if $(NT)
-{
-    actions sleeper
-    {
-        call sleep.bat $(<:B)
-    }
-}
-else
-{
-    actions sleeper
-    {
-        sleep $(<:B)
-    }
-}
+actions sleeper
+{{
+    "{}" -c "import time; time.sleep($(<:B))"
+}}
 
 rule sleeper
-{
+{{
     DEPENDS $(<) : $(>) ;
-}
+}}
 
 NOTFILE front ;
-sleeper 1.a : front ;
-sleeper 2.a : front ;
-sleeper 3.a : front ;
+sleeper 0.2.a : front ;
+sleeper 0.3.a : front ;
+sleeper 0.4.a : front ;
 NOTFILE choke ;
-DEPENDS choke : 1.a 2.a 3.a ;
-sleeper 1.b : choke ;
-sleeper 2.b : choke ;
-sleeper 3.b : choke ;
-DEPENDS bottom : 1.b 2.b 3.b ;
+DEPENDS choke : 0.2.a 0.3.a 0.4.a ;
+sleeper 0.2.b : choke ;
+sleeper 0.3.b : choke ;
+sleeper 0.4.b : choke ;
+DEPENDS bottom : 0.2.b 0.3.b 0.4.b ;
 DEPENDS all : bottom ;
-""")
+""".format(sys.executable))
 
 t.run_build_system(["-ffile.jam", "-j3"])
 t.expect_output_lines("""\
 ...found 10 targets...
 ...updating 6 targets...
-sleeper [123].a
-sleeper [123].a
-sleeper [123].a
-sleeper [123].b
-sleeper [123].b
-sleeper [123].b
+sleeper 0.[234].a
+sleeper 0.[2-4].a
+sleeper 0.[234].a
+sleeper 0.[2-4].b
+sleeper 0.[234].b
+sleeper 0.[2-4].b
 
 ...updated 6 targets...
 """)

test/core_parallel_multifile_actions_1.py

@@ -2,6 +2,7 @@
 
 # Copyright 2007 Rene Rivera.
 # Copyright 2011 Steven Watanabe
+# Copyright 2026 Paolo Pastori
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
 
@@ -16,51 +17,39 @@
 # depending on target A to be built prematurely.
 
 import BoostBuild
+import sys
 
-t = BoostBuild.Tester(["-d1"], pass_toolset=0)
+sleep1_s = 1.0
+sleep2_s = 0.1
 
-t.write("sleep.bat", """\
-::@timeout /T %1 /NOBREAK >nul
-@ping 127.0.0.1 -n 2 -w 1000 >nul
-@ping 127.0.0.1 -n %1 -w 1000 >nul
-@exit /B 0
-""")
+t = BoostBuild.Tester(["-d1"], pass_toolset=False)
 
 t.write("file.jam", """\
-if $(NT)
-{
-    SLEEP = @call sleep.bat ;
-}
-else
-{
-    SLEEP = sleep ;
-}
-
 actions .gen.
-{
+{{
     echo 001
-    $(SLEEP) 4
+    "{0}" -c "import time; time.sleep({1})"
     echo 002
-}
-rule .use.1 { DEPENDS $(<) : $(>) ; }
+}}
+rule .use.1 {{ DEPENDS $(<) : $(>) ; }}
 actions .use.1
-{
+{{
     echo 003
-}
+}}
 
-rule .use.2 { DEPENDS $(<) : $(>) ; }
+rule .use.2 {{ DEPENDS $(<) : $(>) ; }}
 actions .use.2
-{
-    $(SLEEP) 1
+{{
+    "{0}" -c "import time; time.sleep({2})"
     echo 004
-}
+}}
 
 .gen. g1.generated g2.generated ;
 .use.1 u1.user : g1.generated ;
 .use.2 u2.user : g2.generated ;
 
 DEPENDS all : u1.user u2.user ;
-""")
+""".format(sys.executable, sleep1_s, sleep2_s))
 
 t.run_build_system(["-ffile.jam", "-j2"], stdout="""\
 ...found 5 targets...

test/core_parallel_multifile_actions_2.py

@@ -2,6 +2,7 @@
 
 # Copyright 2008 Jurko Gospodnetic, Vladimir Prus
 # Copyright 2011 Steven Watanabe
+# Copyright 2026 Paolo Pastori
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
 
@@ -19,44 +20,31 @@
 # prematurely.
 
 import BoostBuild
+import sys
 
-t = BoostBuild.Tester(pass_toolset=0)
+sleep_s = 0.2
 
-t.write("sleep.bat", """\
-::@timeout /T %1 /NOBREAK >nul
-@ping 127.0.0.1 -n 2 -w 1000 >nul
-@ping 127.0.0.1 -n %1 -w 1000 >nul
-@exit /B 0
-""")
+t = BoostBuild.Tester(pass_toolset=False)
 
 t.write("file.jam", """\
-if $(NT)
-{
-    SLEEP = @call sleep.bat ;
-}
-else
-{
-    SLEEP = sleep ;
-}
-
 actions link
-{
-    $(SLEEP) 1
+{{
+    "{}" -c "import time; time.sleep({})"
     echo 001 - linked
-}
+}}
 
 link dll lib ;
 
 actions install
-{
+{{
     echo 002 - installed
-}
+}}
 
 install installed_dll : dll ;
 DEPENDS installed_dll : dll ;
 
 DEPENDS all : lib installed_dll ;
-""")
+""".format(sys.executable, sleep_s))
 
 t.run_build_system(["-ffile.jam", "-j2"], stdout="""\
 ...found 4 targets...