From 8995eb62368b89c5a84ca7f01a3cbae786aef98f Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 4 Jan 2018 14:40:36 -0500 Subject: [PATCH 1/2] Ensure pruned utils directory is excluded from find output --- Makefile.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.frag b/Makefile.frag index 2e7ff84a3..dba6afe2b 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -72,7 +72,7 @@ test-virtual: package sh ./scripts/run-tests-on.sh precise64 test-clean: - find $(top_srcdir)/tests -path $(top_srcdir)/tests/utils -prune -type f -name "*.diff" -o -name "*.exp" -o -name "*.log" -o -name "*.mem" -o -name "*.out" -o -name "*.php" -o -name "*.sh" | xargs rm + find $(top_srcdir)/tests -not \( -path $(top_srcdir)/tests/utils -prune \) -type f -name "*.diff" -o -name "*.exp" -o -name "*.log" -o -name "*.mem" -o -name "*.out" -o -name "*.php" -o -name "*.sh" | xargs rm package: pecl package package.xml From 6fe5824a2a252f7354f734c89192de76a5f49a33 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 4 Jan 2018 14:45:50 -0500 Subject: [PATCH 2/2] NOP if xargs input is empty --- Makefile.frag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.frag b/Makefile.frag index dba6afe2b..126e964b1 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -72,7 +72,7 @@ test-virtual: package sh ./scripts/run-tests-on.sh precise64 test-clean: - find $(top_srcdir)/tests -not \( -path $(top_srcdir)/tests/utils -prune \) -type f -name "*.diff" -o -name "*.exp" -o -name "*.log" -o -name "*.mem" -o -name "*.out" -o -name "*.php" -o -name "*.sh" | xargs rm + find $(top_srcdir)/tests -not \( -path $(top_srcdir)/tests/utils -prune \) -type f -name "*.diff" -o -name "*.exp" -o -name "*.log" -o -name "*.mem" -o -name "*.out" -o -name "*.php" -o -name "*.sh" | xargs -r rm package: pecl package package.xml