summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2023-02-04 13:12:32 -0500
committerPaul Smith <psmith@gnu.org>2023-02-04 13:12:32 -0500
commite819fc202292cd66a914b18e9f8a4b5ee32ae6b2 (patch)
tree8a091590b17f31a16e4a4b8689d8bbaf30b29c07
parentf21cd822a3a196e70eb6a3a515a63cc7dfd2f24c (diff)
downloadmake-git-e819fc202292cd66a914b18e9f8a4b5ee32ae6b2.tar.gz
* tests/scripts/variables/MAKEFLAGS: Fix some Perl warnings
-rw-r--r--tests/scripts/variables/MAKEFLAGS72
1 files changed, 38 insertions, 34 deletions
diff --git a/tests/scripts/variables/MAKEFLAGS b/tests/scripts/variables/MAKEFLAGS
index 523ec8c3..32c2ede8 100644
--- a/tests/scripts/variables/MAKEFLAGS
+++ b/tests/scripts/variables/MAKEFLAGS
@@ -209,7 +209,7 @@ $answer
# sv 63347.
# Same as above, with makefile setting the value of the same variables as
# defined on the cli.
-my $answer = 'erR -- hello:=world FOO=bar';
+$answer = 'erR -- hello:=world FOO=bar';
run_make_test(q!
$(info $(MAKEFLAGS))
FOO=moon
@@ -224,7 +224,7 @@ $answer
# sv 63347.
# Same as above, with makefile overriding the value of cli definition.
-my $answer = 'erR -- hello:=world FOO=bar';
+$answer = 'erR -- hello:=world FOO=bar';
run_make_test(q!
$(info $(MAKEFLAGS))
override FOO=moon
@@ -240,7 +240,7 @@ $answer
# Same as above, and makefile overrides the value of cli definition.
# resets MAKEOVERRIDES.
-my $answer = 'rR -- hello:=world FOO=bar';
+$answer = 'rR -- hello:=world FOO=bar';
run_make_test(q!
$(info $(MAKEFLAGS))
override FOO=moon
@@ -259,7 +259,7 @@ rR -- \nrR
# sv 63347.
# MAKEFLAGS set is env and makefile sets MAKEFLAGS and there is a command
# line definition.
-my $answer = ' -- bye=moon hello=world';
+$answer = ' -- bye=moon hello=world';
$ENV{'MAKEFLAGS'} = 'hello=world';
run_make_test(q!
$(info $(MAKEFLAGS))
@@ -271,7 +271,7 @@ all:; $(info $(MAKEFLAGS))
# sv 63347.
# Conditional assignment and MAKEFLAGS.
-my $answer = 'B -- bye=moon hello=world';
+$answer = 'B -- bye=moon hello=world';
$ENV{'MAKEFLAGS'} = 'hello=world';
run_make_test(q!
$(info $(MAKEFLAGS))
@@ -389,7 +389,7 @@ all:; $(info good)
# contains the winning switch at parse and build time.
# 9. MAKEFLAGS does not contain the beaten switch.
-my @flavors = ('=', ':=', ':::=', '+=');
+@flavors = ('=', ':=', ':::=', '+=');
# sv 63537
# -w vs --no-print-directory
@@ -489,8 +489,8 @@ run_make_test("
MAKEFLAGS${fl}--no-print-directory
\$(info \$(MAKEFLAGS))
all:
- \$(info \$(MAKEFLAGS))
- \$(MAKE) -C lib2
+\t \$(info \$(MAKEFLAGS))
+\t \$(MAKE) -C lib2
", '-w',
"#MAKE#: Entering directory '#PWD#'
w
@@ -511,8 +511,8 @@ run_make_test("
MAKEFLAGS${fl}--no-print-directory
\$(info \$(MAKEFLAGS))
all:
- \$(info \$(MAKEFLAGS))
- \$(MAKE) -C lib2
+\t \$(info \$(MAKEFLAGS))
+\t \$(MAKE) -C lib2
", '',
"#MAKE#: Entering directory '#PWD#'
w
@@ -535,66 +535,70 @@ rmdir('lib2');
# -S in env.
$ENV{'MAKEFLAGS'} = '-S';
run_make_test(q!
+.RECIPEPREFIX := >
$(info $(MAKEFLAGS))
all: one two
one:
- $(info $(MAKEFLAGS))
- #HELPER# -q fail 1
+> $(info $(MAKEFLAGS))
+> #HELPER# -q fail 1
two:; $(info $@)
!, '',
"S
S
#HELPER# -q fail 1
-#MAKE#: *** [#MAKEFILE#:6: one] Error 1", 512);
+#MAKE#: *** [#MAKEFILE#:7: one] Error 1", 512);
# -S in env, -k on the command line.
$ENV{'MAKEFLAGS'} = '-S';
run_make_test(q!
+.RECIPEPREFIX := >
$(info $(MAKEFLAGS))
all: one two
one:
- $(info $(MAKEFLAGS))
- #HELPER# -q fail 1
+> $(info $(MAKEFLAGS))
+> #HELPER# -q fail 1
two:; $(info $@)
!, '-k',
"k
k
#HELPER# -q fail 1
-#MAKE#: *** [#MAKEFILE#:6: one] Error 1
+#MAKE#: *** [#MAKEFILE#:7: one] Error 1
two
#MAKE#: Target 'all' not remade because of errors.", 512);
# -k in env.
$ENV{'MAKEFLAGS'} = '-k';
run_make_test(q!
+.RECIPEPREFIX := >
$(info $(MAKEFLAGS))
all: one two
one:
- $(info $(MAKEFLAGS))
- #HELPER# -q fail 1
+> $(info $(MAKEFLAGS))
+> #HELPER# -q fail 1
two:; $(info $@)
!, '',
"k
k
#HELPER# -q fail 1
-#MAKE#: *** [#MAKEFILE#:6: one] Error 1
+#MAKE#: *** [#MAKEFILE#:7: one] Error 1
two
#MAKE#: Target 'all' not remade because of errors.", 512);
# -k in env, -S on the command line.
$ENV{'MAKEFLAGS'} = '-k';
run_make_test(q!
+.RECIPEPREFIX := >
$(info $(MAKEFLAGS))
all: one two
one:
- $(info $(MAKEFLAGS))
- #HELPER# -q fail 1
+> $(info $(MAKEFLAGS))
+> #HELPER# -q fail 1
two:; $(info $@)
!, '-S',
"S
S
#HELPER# -q fail 1
-#MAKE#: *** [#MAKEFILE#:6: one] Error 1", 512);
+#MAKE#: *** [#MAKEFILE#:7: one] Error 1", 512);
delete $ENV{'MAKEFLAGS'};
@@ -605,8 +609,8 @@ MAKEFLAGS${fl}-k
\$(info \$(MAKEFLAGS))
all: one two
one:
- \$(info \$(MAKEFLAGS))
- #HELPER# -q fail 1
+\t \$(info \$(MAKEFLAGS))
+\t #HELPER# -q fail 1
two:; \$(info \$@)
", '',
"k
@@ -625,8 +629,8 @@ MAKEFLAGS${fl}-k
\$(info \$(MAKEFLAGS))
all: one two
one:
- \$(info \$(MAKEFLAGS))
- #HELPER# -q fail 1
+\t \$(info \$(MAKEFLAGS))
+\t #HELPER# -q fail 1
two:; \$(info \$@)
", '-S',
"S
@@ -644,8 +648,8 @@ MAKEFLAGS${fl}-k
\$(info \$(MAKEFLAGS))
all: one two
one:
- \$(info \$(MAKEFLAGS))
- #HELPER# -q fail 1
+\t \$(info \$(MAKEFLAGS))
+\t #HELPER# -q fail 1
two:; \$(info \$@)
", '',
"S
@@ -664,8 +668,8 @@ MAKEFLAGS${fl}-S
\$(info \$(MAKEFLAGS))
all: one two
one:
- \$(info \$(MAKEFLAGS))
- #HELPER# -q fail 1
+\t \$(info \$(MAKEFLAGS))
+\t #HELPER# -q fail 1
two:; \$(info \$@)
", '',
"S
@@ -681,8 +685,8 @@ MAKEFLAGS${fl}-S
\$(info \$(MAKEFLAGS))
all: one two
one:
- \$(info \$(MAKEFLAGS))
- #HELPER# -q fail 1
+\t \$(info \$(MAKEFLAGS))
+\t #HELPER# -q fail 1
two:; \$(info \$@)
", '-k',
"k
@@ -702,8 +706,8 @@ MAKEFLAGS${fl}-S
\$(info \$(MAKEFLAGS))
all: one two
one:
- \$(info \$(MAKEFLAGS))
- #HELPER# -q fail 1
+\t \$(info \$(MAKEFLAGS))
+\t #HELPER# -q fail 1
two:; \$(info \$@)
", '',
"k