diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2016-04-30 10:27:36 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-04-30 10:27:44 -0700 |
commit | df4236bb9e906f5b327b790ddc0432b0e280328d (patch) | |
tree | bece7ce30676e31f47bc6976faeee2b7bbc2cc4f /dh_elpa_test | |
parent | f278d610e5da10ca9343881bc2019706cd6eae0c (diff) |
Revert "use semicolons to list entries in env vars"
This reverts commit a2efa770750ea591693cec8bda569bd7e40c16bb.
This would require double-quoting env vars which would be a mess since
one of them is meant to contain lisp.
Diffstat (limited to 'dh_elpa_test')
-rwxr-xr-x | dh_elpa_test | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/dh_elpa_test b/dh_elpa_test index 27f3238..130bf6f 100755 --- a/dh_elpa_test +++ b/dh_elpa_test @@ -46,23 +46,22 @@ If this variable is set, dh_elpa(1) will not invoke B<dh_elpa_test>. =item B<DH_ELPA_TEST_BUTTERCUP_LOAD_PATH> -A semicolon-separated list of directories to add to the load-path when +A comma-separated list of directories to add to the load-path when buttercup(1) invokes Emacs. Will be passed to buttercup(1) with its B<-L> command line argument. =item B<DH_ELPA_TEST_BUTTERCUP_PATTERNS> -A semicolon-separated list of Emacs regular expressions jointly -matching all and only the files containing Buttercup tests that you -wish to run. If this variable is not defined, all tests that can be -found will be run. Will be passed to buttercup(1) with its B<-p> -command line argument. +A comma-separated list of Emacs regular expressions (not containing +any commas) jointly matching all and only the files containing +Buttercup tests that you wish to run. If this variable is not +defined, all tests that can be found will be run. Will be passed to +buttercup(1) with its B<-p> command line argument. =item B<DH_ELPA_TEST_ERT_EXCLUDE> -A semicolon-separated list of file globs and/or Perl regular -expressions matching files containing ERT tests that should not be -run. +A comma-separated list of file globs and/or Perl regular expressions +matching files containing ERT tests that should not be run. =item B<DH_ELPA_TEST_ERT_HELPER> @@ -86,7 +85,7 @@ instance spawned by B<dh_elpa_test> to run those tests. =item B<DH_ELPA_TEST_ERT_LOAD_PATH> -A semicolon-separated list of directories to add to the load-path when +A comma-separated list of directories to add to the load-path when B<dh_elpa_test> invokes Emacs to run ERT tests. =back @@ -116,12 +115,12 @@ my $elpadir="/usr/share/emacs/site-lisp/elpa-src"; if ($control->source->Build_Depends->has( "elpa-buttercup" )) { my @args = qw{ buttercup -L . }; if (defined $ENV{'DH_ELPA_TEST_BUTTERCUP_LOAD_PATH'}) { - foreach my $dir (split(';', $ENV{'DH_ELPA_TEST_BUTTERCUP_LOAD_PATH'})) { + foreach my $dir (split(',', $ENV{'DH_ELPA_TEST_BUTTERCUP_LOAD_PATH'})) { push @args, ('-L', "$dir"); } } if (defined $ENV{'DH_ELPA_TEST_BUTTERCUP_PATTERNS'}) { - foreach my $pattern (split(';', $ENV{'DH_ELPA_TEST_BUTTERCUP_PATTERNS'})) { + foreach my $pattern (split(',', $ENV{'DH_ELPA_TEST_BUTTERCUP_PATTERNS'})) { push @args, ('-p', "$pattern"); } } @@ -136,7 +135,7 @@ my $rule = File::Find::Rule ->grep( "ert-deftest" ) ->none( File::Find::Rule->name('debian/*'), File::Find::Rule->name('.pc/*') ); if (defined $ENV{'DH_ELPA_TEST_ERT_EXCLUDE'}) { - foreach my $glob (split(';', $ENV{'DH_ELPA_TEST_ERT_EXCLUDE'})) { + foreach my $glob (split(',', $ENV{'DH_ELPA_TEST_ERT_EXCLUDE'})) { $rule->not_name($glob); } } @@ -157,7 +156,7 @@ if (@ert_files) { # add the user's load-path entries if (defined $ENV{'DH_ELPA_TEST_ERT_LOAD_PATH'}) { - foreach my $dir (split(';', $ENV{'DH_ELPA_TEST_ERT_LOAD_PATH'})) { + foreach my $dir (split(',', $ENV{'DH_ELPA_TEST_ERT_LOAD_PATH'})) { push @args, ('-L', "$dir"); } } |