[SV 62175] Rework secondary expansion tests

The hash function we use can yield different results on big- and
little-endian systems which makes test output different.  Choose
names to avoid this.

* tests/scripts/features/patternrules: Choose portable target names.
* tests/scripts/features/se_explicit: Ditto.
* tests/scripts/features/se_implicit: Ditto.

diff --git a/tests/scripts/features/patternrules b/tests/scripts/features/patternrules
index 623bb6ed02acbd99b3c09452451c56450490d984..d33e5a95a1eecce2aea8bc9b3fab4c1e915e35a0 100644 (file)
--- a/tests/scripts/features/patternrules
+++ b/tests/scripts/features/patternrules
@@ -345,12 +345,13 @@ unlink('hello.x', 'test.x', 'hello.tsk');
 
 # subtest 1.
 # a.1 and a.2 are intermediate and should be removed.
+
 run_make_test(q!
 a.4:
-%.4: %.1 %.2 ; cat $^ >$@
-%.1 %.2: ; touch $*.1 $*.2
+%.4: %.1 %.15 ; cat $^ >$@
+%.1 %.15: ; touch $*.1 $*.15
 !,
-              '', "touch a.1 a.2\ncat a.1 a.2 >a.4\nrm a.1 a.2");
+              '', "touch a.1 a.15\ncat a.1 a.15 >a.4\nrm a.15 a.1");
 
 unlink('a.4');
 
@@ -359,11 +360,11 @@ unlink('a.4');
 # a.3 is explicit and should not be removed.
 run_make_test(q!
 a.4:
-%.4: %.1 %.2 a.3 ; cat $^ >$@
-%.1 %.2: ; touch $*.1 $*.2
+%.4: %.1 %.15 a.3 ; cat $^ >$@
+%.1 %.15: ; touch $*.1 $*.15
 %.3: ; touch $@
 !,
-              '', "touch a.3\ntouch a.1 a.2\ncat a.1 a.2 a.3 >a.4\nrm a.1 a.2");
+              '', "touch a.3\ntouch a.1 a.15\ncat a.1 a.15 a.3 >a.4\nrm a.15 a.1");
 
 unlink('a.3', 'a.4');
 
@@ -372,10 +373,10 @@ unlink('a.3', 'a.4');
 # a.3 is explicit and should not be removed.
 run_make_test(q!
 a.4:
-%.4: %.1 %.2 a.3 ; cat $^ >$@
-%.1 %.2 %.3: ; touch $*.1 $*.2 $*.3
+%.4: %.1 %.15 a.3 ; cat $^ >$@
+%.1 %.15 %.3: ; touch $*.1 $*.15 $*.3
 !,
-              '', "touch a.1 a.2 a.3\ncat a.1 a.2 a.3 >a.4\nrm a.1 a.2");
+              '', "touch a.1 a.15 a.3\ncat a.1 a.15 a.3 >a.4\nrm a.15 a.1");
 
 unlink('a.3', 'a.4');
 
@@ -384,10 +385,10 @@ unlink('a.3', 'a.4');
 # a.3 is explicit and should not be removed.
 run_make_test(q!
 a.4:
-%.4: %.1 %.2 a.3 ; cat $^ >$@
-%.3 %.1 %.2: ; touch $*.1 $*.2 $*.3
+%.4: %.1 %.15 a.3 ; cat $^ >$@
+%.3 %.1 %.15: ; touch $*.1 $*.15 $*.3
 !,
-              '', "touch a.1 a.2 a.3\ncat a.1 a.2 a.3 >a.4\nrm a.1 a.2");
+              '', "touch a.1 a.15 a.3\ncat a.1 a.15 a.3 >a.4\nrm a.15 a.1");
 
 unlink('a.3', 'a.4');
 
@@ -396,10 +397,10 @@ unlink('a.3', 'a.4');
 # a.3 is explicit and should not be removed.
 run_make_test(q!
 a.4:
-%.4: a.3 %.1 %.2 ; cat $^ >$@
-%.1 %.2 %.3: ; touch $*.1 $*.2 $*.3
+%.4: a.3 %.1 %.15 ; cat $^ >$@
+%.1 %.15 %.3: ; touch $*.1 $*.15 $*.3
 !,
-              '', "touch a.1 a.2 a.3\ncat a.3 a.1 a.2 >a.4\nrm a.1 a.2");
+              '', "touch a.1 a.15 a.3\ncat a.3 a.1 a.15 >a.4\nrm a.15 a.1");
 
 unlink('a.3', 'a.4');
 

diff --git a/tests/scripts/features/se_explicit b/tests/scripts/features/se_explicit
index c0b1f29aabdc74df93cae46e061f65c919f10832..d097e1a88c063536ea564d3390b1a85982bbd43c 100644 (file)
--- a/tests/scripts/features/se_explicit
+++ b/tests/scripts/features/se_explicit
@@ -224,13 +224,13 @@ all: 2.x
 # subtest 2. Explicit rules. 2nd rule.
 run_make_test(q!
 .SECONDEXPANSION:
-all: 2.x 1.x
-2.x: 5.z 6.z 5.z | 7.z 7.z 8.z
+all: 15.x 1.x
+15.x: 5.z 6.z 5.z | 7.z 7.z 8.z
 1.x: 1.z 2.z 2.z | 3.z 4.z
-2.x 1.x: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
+15.x 1.x: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
 %.z: ;
 !, '',
-"@=2.x,<=5.z,^=5.z 6.z,+=5.z 6.z 5.z,|=7.z 8.z,?=,*=,%=
+"@=15.x,<=5.z,^=5.z 6.z,+=5.z 6.z 5.z,|=7.z 8.z,?=,*=,%=
 @=1.x,<=1.z,^=1.z 2.z,+=1.z 2.z 2.z,|=3.z 4.z,?=,*=,%=
 #MAKE#: Nothing to be done for 'all'.\n");
 
@@ -238,11 +238,11 @@ all: 2.x 1.x
 # subtest 3. Grouped targets in explicit rules. 1st rule.
 run_make_test(q!
 .SECONDEXPANSION:
-all: 2.x
-2.x 1.x&: 5.z 6.z 5.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
+all: 15.x
+15.x 1.x&: 5.z 6.z 5.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
 %.z: ;
 !, '',
-"@=2.x,<=,^=,+=,|=,?=,*=,%=
+"@=15.x,<=,^=,+=,|=,?=,*=,%=
 @=1.x,<=,^=,+=,|=,?=,*=,%=
 #MAKE#: Nothing to be done for 'all'.\n");
 
@@ -250,13 +250,13 @@ all: 2.x
 # subtest 4. Grouped targets in explicit rules. 2nd rule.
 run_make_test(q!
 .SECONDEXPANSION:
-all: 2.x 1.x
-2.x: 5.z 6.z 5.z | 7.z 7.z 8.z
+all: 15.x 1.x
+15.x: 5.z 6.z 5.z | 7.z 7.z 8.z
 1.x: 1.z 2.z 2.z | 3.z 4.z
-2.x 1.x&: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
+15.x 1.x&: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
 %.z: ;
 !, '',
-"@=2.x,<=5.z,^=5.z 6.z,+=5.z 6.z 5.z,|=7.z 8.z,?=,*=,%=
+"@=15.x,<=5.z,^=5.z 6.z,+=5.z 6.z 5.z,|=7.z 8.z,?=,*=,%=
 @=1.x,<=1.z,^=1.z 2.z,+=1.z 2.z 2.z,|=3.z 4.z,?=,*=,%=
 #MAKE#: Nothing to be done for 'all'.\n");
 
@@ -280,13 +280,13 @@ all: 2.x
 # subtest 6. 2nd double colon rule.
 run_make_test(q!
 .SECONDEXPANSION:
-all: 2.x 1.x
-2.x:: 5.z 6.z 5.z | 7.z 7.z 8.z ;
+all: 15.x 1.x
+15.x:: 5.z 6.z 5.z | 7.z 7.z 8.z ;
 1.x:: 1.z 2.z 2.z | 3.z 4.z ;
-2.x 1.x:: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
+15.x 1.x:: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*,%=$$%) ;
 %.z: ;
 !, '',
-"@=2.x,<=,^=,+=,|=,?=,*=,%=
+"@=15.x,<=,^=,+=,|=,?=,*=,%=
 @=1.x,<=,^=,+=,|=,?=,*=,%=
 #MAKE#: Nothing to be done for 'all'.\n");
 

diff --git a/tests/scripts/features/se_implicit b/tests/scripts/features/se_implicit
index 65b62501b6d2bef763265640a3eb21158a628a00..e7d884687f004a348799541915e1505b84871e06 100644 (file)
--- a/tests/scripts/features/se_implicit
+++ b/tests/scripts/features/se_implicit
@@ -388,13 +388,13 @@ all: 2.x
 # subtest 4. Static pattern rules. 2nd rule.
 run_make_test(q!
 .SECONDEXPANSION:
-all: 2.x 1.x
-2.x: 5.z 6.z 5.z | 7.z 7.z 8.z
+all: 15.x 1.x
+15.x: 5.z 6.z 5.z | 7.z 7.z 8.z
 1.x: 1.z 2.z 2.z | 3.z 4.z
-2.x 1.x: %.x: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*) ;
+15.x 1.x: %.x: 9.z $$(info @=$$@,<=$$<,^=$$^,+=$$+,|=$$|,?=$$?,*=$$*) ;
 %.z: ;
 !, '',
-"@=2.x,<=5.z,^=5.z 6.z,+=5.z 6.z 5.z,|=7.z 8.z,?=,*=2
+"@=15.x,<=5.z,^=5.z 6.z,+=5.z 6.z 5.z,|=7.z 8.z,?=,*=15
 @=1.x,<=1.z,^=1.z 2.z,+=1.z 2.z 2.z,|=3.z 4.z,?=,*=1
 #MAKE#: Nothing to be done for 'all'.\n");