summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRyan Moeller <[email protected]>2019-08-26 14:48:31 -0400
committerBrian Behlendorf <[email protected]>2019-08-26 11:48:31 -0700
commit142f84dd19f20b47157bbbf45aaba489b6577c88 (patch)
tree2476b46f8f8d2f0c72fc5365e1c183ec7b61f37b /tests
parent95f0144675dd0e18617355443be0fbc7171af76b (diff)
Restore :: in Makefile.am
The double-colon looked like a typo, but it's actually an obscure feature. Rules with :: may appear multiple times and are run independently of one another in the order they appear. The use of :: for distclean-local was conventional, not accidental. Add comments to indicate the intentional use of double-colon rules. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #9210
Diffstat (limited to 'tests')
-rw-r--r--tests/zfs-tests/include/Makefile.am1
-rw-r--r--tests/zfs-tests/tests/functional/pyzfs/Makefile.am1
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am
index 41e105287..86c387c67 100644
--- a/tests/zfs-tests/include/Makefile.am
+++ b/tests/zfs-tests/include/Makefile.am
@@ -16,5 +16,6 @@ $(nodist_pkgdata_DATA): %: %.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@'
+# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local::
-$(RM) default.cfg
diff --git a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
index 0a27adecc..c4cd10894 100644
--- a/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
+++ b/tests/zfs-tests/tests/functional/pyzfs/Makefile.am
@@ -14,5 +14,6 @@ $(pkgpyzfs_SCRIPTS):%:%.in
$< >'$@'
-chmod 775 $@
+# Double-colon rules are allowed; there are multiple independent definitions.
distclean-local::
-$(RM) $(pkgpyzfs_SCRIPTS)