https://gcc.gnu.org/g:add93190d3afd209e40b3f9a5211d622b7b1d770
commit r16-2057-gadd93190d3afd209e40b3f9a5211d622b7b1d770 Author: Eric Botcazou <ebotca...@adacore.com> Date: Mon Jul 7 13:52:58 2025 +0200 Ada: Reapply tweaks to delay statements in ACATS 3&4 testsuites They had originally been applied to the ACATS 2 testsuite and I forgot to reapply them to the ACATS 4 testsuite altogether. gcc/testsuite/ * ada/acats-3/tests/c9/c94001c.ada: Tweak delay statements. * ada/acats-4/tests/c9/c94001c.ada: Likewise. * ada/acats-4/tests/c9/c94006a.ada: Likewise. * ada/acats-4/tests/c9/c94008c.ada: Likewise. * ada/acats-4/tests/c9/c951002.a: Likewise. * ada/acats-4/tests/c9/c954a01.a: Likewise. * ada/acats-4/tests/c9/c940005.a: Tweak duration constants. * ada/acats-4/tests/c9/c940007.a: Likewise. * ada/acats-4/tests/c9/c96001a.ada: Likewise. Diff: --- gcc/testsuite/ada/acats-3/tests/c9/c94001c.ada | 4 ++-- gcc/testsuite/ada/acats-4/tests/c9/c940005.a | 2 +- gcc/testsuite/ada/acats-4/tests/c9/c940007.a | 2 +- gcc/testsuite/ada/acats-4/tests/c9/c94001c.ada | 4 ++-- gcc/testsuite/ada/acats-4/tests/c9/c94006a.ada | 3 ++- gcc/testsuite/ada/acats-4/tests/c9/c94008c.ada | 9 +++++---- gcc/testsuite/ada/acats-4/tests/c9/c951002.a | 8 ++++---- gcc/testsuite/ada/acats-4/tests/c9/c954a01.a | 4 ++-- gcc/testsuite/ada/acats-4/tests/c9/c96001a.ada | 7 ++++--- 9 files changed, 23 insertions(+), 20 deletions(-) diff --git a/gcc/testsuite/ada/acats-3/tests/c9/c94001c.ada b/gcc/testsuite/ada/acats-3/tests/c9/c94001c.ada index 0cc14f495cd4..df38f99d7352 100644 --- a/gcc/testsuite/ada/acats-3/tests/c9/c94001c.ada +++ b/gcc/testsuite/ada/acats-3/tests/c9/c94001c.ada @@ -211,7 +211,7 @@ BEGIN BEGIN -- (E) WHILE NOT(OUT_TSK'TERMINATED) AND DELAY_COUNT < 60 LOOP - DELAY 1.0; + DELAY 1.0 * Impdef.One_Long_Second; DELAY_COUNT := DELAY_COUNT + 1; END LOOP; IF DELAY_COUNT = 60 THEN @@ -254,7 +254,7 @@ BEGIN BEGIN WHILE NOT(OUT_TSK'TERMINATED) AND DELAY_COUNT < 60 LOOP - DELAY 1.0; + DELAY 1.0 * Impdef.One_Long_Second; DELAY_COUNT := DELAY_COUNT + 1; END LOOP; IF DELAY_COUNT = 60 THEN diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c940005.a b/gcc/testsuite/ada/acats-4/tests/c9/c940005.a index adb58b18ca4b..47a97bf2de65 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c940005.a +++ b/gcc/testsuite/ada/acats-4/tests/c9/c940005.a @@ -85,7 +85,7 @@ begin -- In reality one would expect a time of 5 to 10 seconds. In -- the interests of speeding up the test suite a shorter time -- is used - Pulse_Time_Delta : constant duration := ImpDef.Switch_To_New_Task; + Pulse_Time_Delta : constant duration := ImpDef.Long_Switch_To_New_Task; -- control over stopping tasks protected Control is diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c940007.a b/gcc/testsuite/ada/acats-4/tests/c9/c940007.a index c678463633a2..41e80f4e25ee 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c940007.a +++ b/gcc/testsuite/ada/acats-4/tests/c9/c940007.a @@ -90,7 +90,7 @@ begin -- In reality one would expect a time of 5 to 10 seconds. In -- the interests of speeding up the test suite a shorter time -- is used - Pulse_Time_Delta : constant duration := ImpDef.Switch_To_New_Task; + Pulse_Time_Delta : constant duration := ImpDef.Long_Switch_To_New_Task; -- control over stopping tasks diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c94001c.ada b/gcc/testsuite/ada/acats-4/tests/c9/c94001c.ada index 0cc14f495cd4..df38f99d7352 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c94001c.ada +++ b/gcc/testsuite/ada/acats-4/tests/c9/c94001c.ada @@ -211,7 +211,7 @@ BEGIN BEGIN -- (E) WHILE NOT(OUT_TSK'TERMINATED) AND DELAY_COUNT < 60 LOOP - DELAY 1.0; + DELAY 1.0 * Impdef.One_Long_Second; DELAY_COUNT := DELAY_COUNT + 1; END LOOP; IF DELAY_COUNT = 60 THEN @@ -254,7 +254,7 @@ BEGIN BEGIN WHILE NOT(OUT_TSK'TERMINATED) AND DELAY_COUNT < 60 LOOP - DELAY 1.0; + DELAY 1.0 * Impdef.One_Long_Second; DELAY_COUNT := DELAY_COUNT + 1; END LOOP; IF DELAY_COUNT = 60 THEN diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c94006a.ada b/gcc/testsuite/ada/acats-4/tests/c9/c94006a.ada index 6b9c85f490e2..cac5fc6e09c4 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c94006a.ada +++ b/gcc/testsuite/ada/acats-4/tests/c9/c94006a.ada @@ -28,6 +28,7 @@ -- TBN 9/17/86 -- PWN 01/31/95 REMOVED PRAGMA PRIORITY FOR ADA 9X. +with Impdef; WITH REPORT; USE REPORT; WITH SYSTEM; USE SYSTEM; PROCEDURE C94006A IS @@ -41,7 +42,7 @@ PROCEDURE C94006A IS SELECT ACCEPT E; OR - DELAY 30.0; + DELAY 30.0 * Impdef.One_Long_Second; END SELECT; END TT; diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c94008c.ada b/gcc/testsuite/ada/acats-4/tests/c9/c94008c.ada index 6d10e25f0247..fb2eee97f696 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c94008c.ada +++ b/gcc/testsuite/ada/acats-4/tests/c9/c94008c.ada @@ -33,6 +33,7 @@ -- JBG 8/29/86 ELIMINATED SHARED VARIABLES; ADDED GENERIC UNIT -- PWN 11/30/94 REMOVED PRAGMA PRIORITY INSTANCES FOR ADA 9X. +with Impdef; WITH REPORT; USE REPORT; WITH SYSTEM; USE SYSTEM; PROCEDURE C94008C IS @@ -198,10 +199,10 @@ BEGIN -- C94008C OR WHEN ENTER_TERMINATE => TERMINATE; END SELECT; - DELAY 10.0; + DELAY 10.0 * Impdef.One_Second; IF TERMINATE_COUNT.GET /= 1 THEN - DELAY 20.0; + DELAY 20.0 * Impdef.One_Long_Second; END IF; IF TERMINATE_COUNT.GET /= 1 THEN @@ -239,10 +240,10 @@ BEGIN -- C94008C BEGIN - DELAY 10.0; -- WAIT FOR T1, T2, AND T3 TO GET TO SELECT STMTS. + DELAY 10.0 * Impdef.One_Second; -- WAIT FOR T1, T2, AND T3 TO GET TO SELECT STMTS. IF TERMINATE_COUNT.GET /= 3 THEN - DELAY 20.0; + DELAY 20.0 * Impdef.One_Long_Second; END IF; IF TERMINATE_COUNT.GET /= 3 THEN diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c951002.a b/gcc/testsuite/ada/acats-4/tests/c9/c951002.a index 8ccb2d012fea..65b696c4af93 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c951002.a +++ b/gcc/testsuite/ada/acats-4/tests/c9/c951002.a @@ -278,14 +278,14 @@ begin -- Wait until the message is queued on the entry before starting -- the Credit_Task while not Hold.TC_Message_is_Queued loop - delay ImpDef.Minimum_Task_Switch; + delay ImpDef.Long_Minimum_Task_Switch; end loop; -- Credit_Task.TC_Start; -- Ensure the first part of the test is complete before continuing while not (Credit_Message'terminated and Credit_Task'terminated) loop - delay ImpDef.Minimum_Task_Switch; + delay ImpDef.Long_Minimum_Task_Switch; end loop; --====================================================== @@ -298,12 +298,12 @@ begin -- for it to reach the accept statement and call Hold.Set_DB_Overload -- before starting Debit_Message -- - delay ImpDef.Switch_To_New_Task; + delay ImpDef.Long_Switch_To_New_Task; Debit_Message.TC_Start; while not Debit_Task'terminated loop - delay ImpDef.Minimum_Task_Switch; + delay ImpDef.Long_Minimum_Task_Switch; end loop; Hold.Clear_DB_Overload; -- Allow completion diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c954a01.a b/gcc/testsuite/ada/acats-4/tests/c9/c954a01.a index 34f48b29171f..3ea545a8f0ec 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c954a01.a +++ b/gcc/testsuite/ada/acats-4/tests/c9/c954a01.a @@ -148,7 +148,7 @@ package body C954A01_0 is -- Printer server abstraction. end select; -- Allow other tasks to get control - delay ImpDef.Minimum_Task_Switch; + delay ImpDef.Long_Minimum_Task_Switch; end loop; @@ -175,7 +175,7 @@ use F954A00; procedure C954A01 is - Long_Enough : constant Duration := ImpDef.Switch_To_New_Task; + Long_Enough : constant Duration := ImpDef.Long_Switch_To_New_Task; --==============================================-- diff --git a/gcc/testsuite/ada/acats-4/tests/c9/c96001a.ada b/gcc/testsuite/ada/acats-4/tests/c9/c96001a.ada index 74374b9603d8..f958ea107fe5 100644 --- a/gcc/testsuite/ada/acats-4/tests/c9/c96001a.ada +++ b/gcc/testsuite/ada/acats-4/tests/c9/c96001a.ada @@ -36,6 +36,7 @@ -- RJW 11/13/87 ADDED CODE WHICH ALLOWS TEST TO REPORT "PASSED" -- IF TICK > DURATION'SMALL. +with Impdef; WITH CALENDAR; USE CALENDAR; WITH SYSTEM; USE SYSTEM; WITH REPORT; USE REPORT; @@ -50,7 +51,7 @@ BEGIN --------------------------------------------- DECLARE -- (A) - X : DURATION := 5.0; + X : DURATION := 5.0 * Impdef.One_Second; OLD_TIME : TIME; LAPSE : DURATION; BEGIN -- (A) @@ -138,8 +139,8 @@ BEGIN --------------------------------------------- DECLARE -- (E) - INC1 : DURATION := 2.0; - INC2 : DURATION := 3.0; + INC1 : DURATION := 2.0 * Impdef.One_Second; + INC2 : DURATION := 3.0 * Impdef.One_Second; OLD_TIME : TIME; LAPSE : DURATION; BEGIN -- (E)