Remove legacy punctuation hacks tests which no longer work by design.

I assume backwards compatibility in this area was broken by design. Adding
--max-parallel to these in 6dd27753803ae2091a9fc3aedc8e70548ea87675 was wrong
and negated their whole point, i.e. testing of backwards compatibility when
parallel options were not supported.
(cherry picked from commit ca0ad4922ada7ae013b035cfe1550a257a330809)

diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests
index 34b18773a150a77c4bbaf510b9ef54a13a2651cd..2204f3f5a57ca3e730188e11f3460c91e02cc3ec 100755 (executable)
--- a/t/buildsystems/buildsystem_tests
+++ b/t/buildsystems/buildsystem_tests
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-use Test::More tests => 297;
+use Test::More tests => 291;
 
 use strict;
 use warnings;
@@ -606,53 +606,17 @@ sub do_rules_for_parallel {
 
 doit("ln", "-s", "parallel.mk", "Makefile");
 
-# Test if legacy punctuation hacks (+) work as before
+# Test if dh+override+$(MAKE) legacy punctuation hack work as before
 $ENV{MAKEFLAGS} = "-j5";
 $ENV{DEB_BUILD_OPTIONS} = "parallel=5";
-$tmp = write_debian_rules(<<'EOF');
-#!/usr/bin/make -f
-%:
-       @dh_clean > /dev/null 2>&1
-       @+dh --buildsystem=makefile --max-parallel=5 --after=dh_auto_configure --until=dh_auto_build $@
-       @dh_clean > /dev/null 2>&1
-EOF
-test_is_parallel( do_rules_for_parallel("build", "include debian/rules"),
-       "legacy punctuation hacks: +dh, no override" );
-unlink "debian/rules";
 
-write_debian_rules(<<'EOF');
-#!/usr/bin/make -f
-override_dh_auto_build:
-       dh_auto_build
-%:
-       @dh_clean > /dev/null 2>&1
-       @+dh --buildsystem=makefile --max-parallel=5 --after=dh_auto_configure --until=dh_auto_build $@
-       @dh_clean > /dev/null 2>&1
-EOF
-test_is_parallel( do_rules_for_parallel("build", "include debian/rules"),
-       "legacy punctuation hacks: +dh, override without +, parallel, no make warnings" );
-unlink "debian/rules";
-
-write_debian_rules(<<'EOF');
-#!/usr/bin/make -f
-override_dh_auto_build:
-       +dh_auto_build
-%:
-       @dh_clean > /dev/null 2>&1
-       @+dh --buildsystem=makefile --max-parallel=5 --after=dh_auto_configure --until=dh_auto_build $@
-       @dh_clean > /dev/null 2>&1
-EOF
-test_is_parallel( do_rules_for_parallel("build", "include debian/rules"),
-       "legacy punctuation hacks: +dh, override with +" );
-unlink "debian/rules";
-
-write_debian_rules(<<'EOF');
+$tmp = write_debian_rules(<<'EOF');
 #!/usr/bin/make -f
 override_dh_auto_build:
        $(MAKE)
 %:
        @dh_clean > /dev/null 2>&1
-       @+dh --buildsystem=makefile --max-parallel=5 --after=dh_auto_configure --until=dh_auto_build $@
+       @+dh --buildsystem=makefile --after=dh_auto_configure --until=dh_auto_build $@
        @dh_clean > /dev/null 2>&1
 EOF
 test_is_parallel( do_rules_for_parallel("build", "include debian/rules"),