From fdd61fc06865d4393246da2ce05bad96c1aef5aa Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 2 Apr 2023 17:30:27 -0400 Subject: * tests/scripts/targets/WAIT: Add whitespace to avoid W32 issues On Windows systems, "X:" for any "X" is considered a drive letter so add whitespace. --- tests/scripts/targets/WAIT | 144 ++++++++++++++++++++++----------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/tests/scripts/targets/WAIT b/tests/scripts/targets/WAIT index 4d56f6e7..b58ba36b 100644 --- a/tests/scripts/targets/WAIT +++ b/tests/scripts/targets/WAIT @@ -310,12 +310,12 @@ unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! all: A B -A::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done -A::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done -A::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done -B::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done -B::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done -B::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done +A ::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done +A ::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done +A ::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done +B ::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done +B ::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done +B ::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done # This is just here so we don't fail with older versions of make .WAIT: @@ -330,12 +330,12 @@ unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! all: A .WAIT B -A::; @#HELPER# -q out $@-1 out $@-1-done -A::; @#HELPER# -q out $@-2 out $@-2-done -A::; @#HELPER# -q out $@-3 out $@-3-done -B::; @#HELPER# -q out $@-1 out $@-1-done -B::; @#HELPER# -q out $@-2 out $@-2-done -B::; @#HELPER# -q out $@-3 out $@-3-done +A ::; @#HELPER# -q out $@-1 out $@-1-done +A ::; @#HELPER# -q out $@-2 out $@-2-done +A ::; @#HELPER# -q out $@-3 out $@-3-done +B ::; @#HELPER# -q out $@-1 out $@-1-done +B ::; @#HELPER# -q out $@-2 out $@-2-done +B ::; @#HELPER# -q out $@-3 out $@-3-done # This is just here so we don't fail with older versions of make .WAIT: @@ -355,12 +355,12 @@ B::; @#HELPER# -q out $@-3 out $@-3-done unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! -A::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done -A::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done -A::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done -B::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done -B::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done -B::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done +A ::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done +A ::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done +A ::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done +B ::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done +B ::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done +B ::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done # This is just here so we don't fail with older versions of make .WAIT: @@ -375,12 +375,12 @@ unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); # right. The targets are specified on the command line. run_make_test(q! -A::; @#HELPER# -q out $@-1 out $@-1-done -A::; @#HELPER# -q out $@-2 out $@-2-done -A::; @#HELPER# -q out $@-3 out $@-3-done -B::; @#HELPER# -q out $@-1 out $@-1-done -B::; @#HELPER# -q out $@-2 out $@-2-done -B::; @#HELPER# -q out $@-3 out $@-3-done +A ::; @#HELPER# -q out $@-1 out $@-1-done +A ::; @#HELPER# -q out $@-2 out $@-2-done +A ::; @#HELPER# -q out $@-3 out $@-3-done +B ::; @#HELPER# -q out $@-1 out $@-1-done +B ::; @#HELPER# -q out $@-2 out $@-2-done +B ::; @#HELPER# -q out $@-3 out $@-3-done # This is just here so we don't fail with older versions of make .WAIT: @@ -400,12 +400,12 @@ unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! all: C .WAIT A B -A::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done -A::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done -A::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done -B::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done -B::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done -B::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done +A ::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done +A ::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done +A ::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done +B ::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done +B ::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done +B ::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done C: D E D:; @#HELPER# -q out D file D wait E-done out D-done @@ -433,12 +433,12 @@ unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! all: C .WAIT A .WAIT B -A::; @#HELPER# -q out $@-1 out $@-1-done -A::; @#HELPER# -q out $@-2 out $@-2-done -A::; @#HELPER# -q out $@-3 out $@-3-done -B::; @#HELPER# -q out $@-1 out $@-1-done -B::; @#HELPER# -q out $@-2 out $@-2-done -B::; @#HELPER# -q out $@-3 out $@-3-done +A ::; @#HELPER# -q out $@-1 out $@-1-done +A ::; @#HELPER# -q out $@-2 out $@-2-done +A ::; @#HELPER# -q out $@-3 out $@-3-done +B ::; @#HELPER# -q out $@-1 out $@-1-done +B ::; @#HELPER# -q out $@-2 out $@-2-done +B ::; @#HELPER# -q out $@-3 out $@-3-done C: D E D:; @#HELPER# -q out D file D wait E-done out D-done @@ -463,12 +463,12 @@ unlink('D', 'D-done', 'E', 'E-done'); unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! -A::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done -A::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done -A::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done -B::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done -B::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done -B::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done +A ::; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done +A ::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done +A ::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done +B ::; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done +B ::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done +B ::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done C: D E D:; @#HELPER# -q out D file D wait E-done out D-done @@ -494,12 +494,12 @@ unlink('D', 'D-done', 'E', 'E-done'); unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! -A::; @#HELPER# -q out $@-1 out $@-1-done -A::; @#HELPER# -q out $@-2 out $@-2-done -A::; @#HELPER# -q out $@-3 out $@-3-done -B::; @#HELPER# -q out $@-1 out $@-1-done -B::; @#HELPER# -q out $@-2 out $@-2-done -B::; @#HELPER# -q out $@-3 out $@-3-done +A ::; @#HELPER# -q out $@-1 out $@-1-done +A ::; @#HELPER# -q out $@-2 out $@-2-done +A ::; @#HELPER# -q out $@-3 out $@-3-done +B ::; @#HELPER# -q out $@-1 out $@-1-done +B ::; @#HELPER# -q out $@-2 out $@-2-done +B ::; @#HELPER# -q out $@-3 out $@-3-done C: D E D:; @#HELPER# -q out D file D wait E-done out D-done @@ -527,12 +527,12 @@ unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! all: A B -A:: D; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done -A::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done -A::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done -B:: E; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done -B::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done -B::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done +A :: D; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done +A ::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done +A ::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done +B :: E; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done +B ::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done +B ::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done D:; @#HELPER# -q out D file D wait E-done out D-done E:; @#HELPER# -q wait D out E out E-done file E-done @@ -558,12 +558,12 @@ unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! all: A .WAIT B -A:: D; @#HELPER# -q out $@-1 out $@-1-done -A:: ; @#HELPER# -q out $@-2 out $@-2-done -A:: ; @#HELPER# -q out $@-3 out $@-3-done -B:: E; @#HELPER# -q out $@-1 out $@-1-done -B:: ; @#HELPER# -q out $@-2 out $@-2-done -B:: ; @#HELPER# -q out $@-3 out $@-3-done +A :: D; @#HELPER# -q out $@-1 out $@-1-done +A :: ; @#HELPER# -q out $@-2 out $@-2-done +A :: ; @#HELPER# -q out $@-3 out $@-3-done +B :: E; @#HELPER# -q out $@-1 out $@-1-done +B :: ; @#HELPER# -q out $@-2 out $@-2-done +B :: ; @#HELPER# -q out $@-3 out $@-3-done D:; @#HELPER# -q out D out D-done E:; @#HELPER# -q out E out E-done @@ -587,12 +587,12 @@ unlink('D', 'D-done', 'E', 'E-done'); unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! -A:: D; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done -A::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done -A::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done -B:: E; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done -B::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done -B::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done +A :: D; @#HELPER# -q out A-1 file A-1-done wait B-1-done out A-1-done +A ::; @#HELPER# -q out A-2 file A-2-done wait B-2-done out A-2-done +A ::; @#HELPER# -q out A-3 file A-3-done wait B-3-done out A-3-done +B :: E; @#HELPER# -q wait A-1-done out B-1 out B-1-done file B-1-done +B ::; @#HELPER# -q wait A-2-done out B-2 out B-2-done file B-2-done +B ::; @#HELPER# -q wait A-3-done out B-3 out B-3-done file B-3-done D:; @#HELPER# -q out D file D wait E-done out D-done E:; @#HELPER# -q wait D out E out E-done file E-done @@ -617,12 +617,12 @@ unlink('D', 'D-done', 'E', 'E-done'); unlink('A-1-done', 'A-2-done', 'A-3-done', 'B-1-done', 'B-2-done', 'B-3-done'); run_make_test(q! -A:: D; @#HELPER# -q out $@-1 out $@-1-done -A:: ; @#HELPER# -q out $@-2 out $@-2-done -A:: ; @#HELPER# -q out $@-3 out $@-3-done -B:: E; @#HELPER# -q out $@-1 out $@-1-done -B:: ; @#HELPER# -q out $@-2 out $@-2-done -B:: ; @#HELPER# -q out $@-3 out $@-3-done +A :: D; @#HELPER# -q out $@-1 out $@-1-done +A :: ; @#HELPER# -q out $@-2 out $@-2-done +A :: ; @#HELPER# -q out $@-3 out $@-3-done +B :: E; @#HELPER# -q out $@-1 out $@-1-done +B :: ; @#HELPER# -q out $@-2 out $@-2-done +B :: ; @#HELPER# -q out $@-3 out $@-3-done D:; @#HELPER# -q out D out D-done E:; @#HELPER# -q out E out E-done -- cgit v1.2.1