diff options
| -rw-r--r-- | tests/ChangeLog | 6 | ||||
| -rw-r--r-- | tests/scripts/functions/wildcard | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index cb3edeb..9506a3f 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2005-08-13 Boris Kolpackov <boris@kolpackov.net> + + * scripts/functions/wildcard: Wrap calls to $(wildcard ) with + $(sort) so that the resulting order is no longer filesystem- + dependant. + 2005-08-10 Boris Kolpackov <boris@kolpackov.net> * scripts/features/statipattrules: Add a test for Savannah bug #13881. diff --git a/tests/scripts/functions/wildcard b/tests/scripts/functions/wildcard index 5e5a5ff..d7a50aa 100644 --- a/tests/scripts/functions/wildcard +++ b/tests/scripts/functions/wildcard @@ -29,13 +29,13 @@ open(MAKEFILE,"> $makefile"); print MAKEFILE <<EOM; .PHONY: print1 print2 clean -print1: ;\@echo \$(wildcard example.*) +print1: ;\@echo \$(sort \$(wildcard example.*)) print2: -\t\@echo \$(wildcard example.?) -\t\@echo \$(wildcard example.[a-z0-9]) -\t\@echo \$(wildcard example.[!A-Za-z_\\!]) +\t\@echo \$(sort \$(wildcard example.?)) +\t\@echo \$(sort \$(wildcard example.[a-z0-9])) +\t\@echo \$(sort \$(wildcard example.[!A-Za-z_\\!])) clean: -\t$delete_command \$(wildcard example.*) +\t$delete_command \$(sort \$(wildcard example.*)) EOM # END of Contents of MAKEFILE |